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

Commit bf87413

Browse files
committed
Revert "$roomlist-header-color -> $tertiary-content"
This reverts commit 25a3a8d.
1 parent 8aacd96 commit bf87413

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

res/css/structures/_LeftPanelWidget.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ limitations under the License.
2424
align-items: center;
2525

2626
height: 24px;
27-
color: $tertiary-content;
27+
color: $roomlist-header-color;
2828
margin-top: 4px;
2929

3030
.mx_LeftPanelWidget_stickable {
@@ -62,7 +62,7 @@ limitations under the License.
6262
mask-position: center;
6363
mask-size: contain;
6464
mask-repeat: no-repeat;
65-
background-color: $tertiary-content;
65+
background-color: $roomlist-header-color;
6666
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
6767
}
6868

res/css/structures/_SpacePanel.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $activeBorderColor: $secondary-content;
4949
mask-repeat: no-repeat;
5050
margin-left: $gutterSize;
5151
margin-bottom: 12px;
52-
background-color: $tertiary-content;
52+
background-color: $roomlist-header-color;
5353
mask-image: url('$(res)/img/element-icons/expand-space-panel.svg');
5454

5555
&.expanded {
@@ -161,7 +161,7 @@ $activeBorderColor: $secondary-content;
161161
mask-position: center;
162162
mask-size: 20px;
163163
mask-repeat: no-repeat;
164-
background-color: $tertiary-content;
164+
background-color: $roomlist-header-color;
165165
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
166166
}
167167

res/css/views/rooms/_RoomSublist.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ limitations under the License.
4444
// Allow the container to collapse on itself if its children
4545
// are not in the normal document flow
4646
max-height: 24px;
47-
color: $tertiary-content;
47+
color: $roomlist-header-color;
4848

4949
.mx_RoomSublist_stickable {
5050
flex: 1;
@@ -161,7 +161,7 @@ limitations under the License.
161161
mask-position: center;
162162
mask-size: contain;
163163
mask-repeat: no-repeat;
164-
background-color: $tertiary-content;
164+
background-color: $roomlist-header-color;
165165
mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
166166
}
167167

@@ -262,7 +262,7 @@ limitations under the License.
262262
mask-position: center;
263263
mask-size: contain;
264264
mask-repeat: no-repeat;
265-
background: $tertiary-content;
265+
background: $roomlist-header-color;
266266
left: -1px; // adjust for image position
267267
}
268268

res/themes/dark/css/_dark.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,19 @@ $theme-button-bg-color: #e3e8f0;
125125

126126
$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
127127
$roomlist-bg-color: rgba(33, 38, 44, 0.90);
128+
$roomlist-header-color: $tertiary-content;
128129
$roomsublist-divider-color: $primary-content;
129130
$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #3e444c 0%, #3e444c00 100%);
130131

131-
$groupFilterPanel-divider-color: $tertiary-content;
132+
$groupFilterPanel-divider-color: $roomlist-header-color;
132133

133134
$roomtile-preview-color: $secondary-content;
134135
$roomtile-default-badge-bg-color: #61708b;
135136
$roomtile-selected-bg-color: rgba(141, 151, 165, 0.2);
136137

137138
// ********************
138139

139-
$notice-secondary-color: $tertiary-content;
140+
$notice-secondary-color: $roomlist-header-color;
140141

141142
$panel-divider-color: transparent;
142143

res/themes/light-custom/css/_custom.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ $authpage-lang-color: var(--timeline-text-color);
8484
$roomheader-color: var(--timeline-text-color);
8585
// --roomlist-text-secondary-color
8686
$roomtile-preview-color: var(--roomlist-text-secondary-color);
87-
$tertiary-content: var(--roomlist-text-secondary-color);
87+
$roomlist-header-color: var(--roomlist-text-secondary-color);
8888
$roomtile-default-badge-bg-color: var(--roomlist-text-secondary-color);
8989

9090
//

res/themes/light/css/_light.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,11 @@ $theme-button-bg-color: $quinary-content;
187187

188188
$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons
189189
$roomlist-bg-color: rgba(245, 245, 245, 0.90);
190+
$roomlist-header-color: $tertiary-content;
190191
$roomsublist-divider-color: $primary-content;
191192
$roomsublist-skeleton-ui-bg: linear-gradient(180deg, #ffffff 0%, #ffffff00 100%);
192193

193-
$groupFilterPanel-divider-color: $tertiary-content;
194+
$groupFilterPanel-divider-color: $roomlist-header-color;
194195

195196
$roomtile-preview-color: $secondary-content;
196197
$roomtile-default-badge-bg-color: #61708b;
@@ -211,7 +212,7 @@ $username-variant6-color: #2dc2c5;
211212
$username-variant7-color: #5c56f5;
212213
$username-variant8-color: #74d12c;
213214

214-
$notice-secondary-color: $tertiary-content;
215+
$notice-secondary-color: $roomlist-header-color;
215216

216217
$panel-divider-color: transparent;
217218

0 commit comments

Comments
 (0)