Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 2ddc07e

Browse files
authored
Merge pull request #5958 from matrix-org/travis/voicemessages/dark
Support a dark theme for voice messages
2 parents 704edfc + ba2da68 commit 2ddc07e

File tree

6 files changed

+26
-3
lines changed

6 files changed

+26
-3
lines changed

res/css/views/rooms/_VoiceRecordComposerTile.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ limitations under the License.
4040
height: 18px;
4141
vertical-align: middle;
4242
margin-right: 7px; // distance from left edge of waveform container (container has some margin too)
43-
background-color: $muted-fg-color;
43+
background-color: $voice-record-icon-color;
4444
mask-repeat: no-repeat;
4545
mask-size: contain;
4646
mask-image: url('$(res)/img/element-icons/trashcan.svg');

res/css/views/voice_messages/_PlayPauseButton.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ limitations under the License.
1919
width: 32px;
2020
height: 32px;
2121
border-radius: 32px;
22-
background-color: $primary-bg-color;
22+
background-color: $voice-playback-button-bg-color;
2323

2424
&::before {
2525
content: '';
2626
position: absolute; // sizing varies by icon
27-
background-color: $muted-fg-color;
27+
background-color: $voice-playback-button-fg-color;
2828
mask-repeat: no-repeat;
2929
mask-size: contain;
3030
}

res/themes/dark/css/_dark.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ $preview-bar-bg-color: $header-panel-bg-color;
4242
$groupFilterPanel-bg-color: rgba(38, 39, 43, 0.82);
4343
$inverted-bg-color: $base-color;
4444

45+
$voice-record-stop-border-color: #6F7882; // "Quarterly"
46+
$voice-record-waveform-bg-color: #394049; // "Dark Tile"
47+
$voice-record-waveform-fg-color: $tertiary-fg-color;
48+
$voice-record-waveform-incomplete-fg-color: #5b646d;
49+
$voice-record-icon-color: $tertiary-fg-color;
50+
$voice-playback-button-bg-color: $tertiary-fg-color;
51+
$voice-playback-button-fg-color: $bg-color;
52+
4553
// used by AddressSelector
4654
$selected-color: $room-highlight-color;
4755

res/themes/legacy-dark/css/_legacy-dark.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,15 @@ $roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%)
124124

125125
$groupFilterPanel-divider-color: $roomlist-header-color;
126126

127+
// See non-legacy dark for variable information
128+
$voice-record-stop-border-color: #6F7882;
129+
$voice-record-waveform-bg-color: #394049;
130+
$voice-record-waveform-fg-color: $tertiary-fg-color;
131+
$voice-record-waveform-incomplete-fg-color: #5b646d;
132+
$voice-record-icon-color: $tertiary-fg-color;
133+
$voice-playback-button-bg-color: $tertiary-fg-color;
134+
$voice-playback-button-fg-color: $bg-color;
135+
127136
$roomtile-preview-color: #9e9e9e;
128137
$roomtile-default-badge-bg-color: #61708b;
129138
$roomtile-selected-bg-color: #1A1D23;

res/themes/legacy-light/css/_legacy-light.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ $voice-record-waveform-bg-color: #E3E8F0;
198198
$voice-record-waveform-fg-color: $muted-fg-color;
199199
$voice-record-waveform-incomplete-fg-color: #C1C6CD;
200200
$voice-record-live-circle-color: #ff4b55;
201+
$voice-record-icon-color: $muted-fg-color;
202+
$voice-playback-button-bg-color: $primary-bg-color;
203+
$voice-playback-button-fg-color: $muted-fg-color;
201204

202205
$roomtile-preview-color: #9e9e9e;
203206
$roomtile-default-badge-bg-color: #61708b;

res/themes/light/css/_light.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,9 @@ $voice-record-waveform-bg-color: #E3E8F0;
188188
$voice-record-waveform-fg-color: $muted-fg-color;
189189
$voice-record-waveform-incomplete-fg-color: #C1C6CD;
190190
$voice-record-live-circle-color: #ff4b55; // $warning-color, but without letting people change it in themes
191+
$voice-record-icon-color: $muted-fg-color;
192+
$voice-playback-button-bg-color: $primary-bg-color;
193+
$voice-playback-button-fg-color: $muted-fg-color;
191194

192195
$roomtile-preview-color: $secondary-fg-color;
193196
$roomtile-default-badge-bg-color: #61708b;

0 commit comments

Comments
 (0)