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

Commit 3edb6b2

Browse files
turt2liveturt2live
authored
Merge pull request #5309 from RinkiyaKeDad/fix-final-10
Renamed TagPanel and TagOrderStore
2 parents 7cce8a3 + 25db3ac commit 3edb6b2

File tree

26 files changed

+114
-114
lines changed

26 files changed

+114
-114
lines changed

‎res/css/_components.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
@import "./structures/_ScrollPanel.scss";
2727
@import "./structures/_SearchBox.scss";
2828
@import "./structures/_TabbedView.scss";
29-
@import "./structures/_TagPanel.scss";
29+
@import "./structures/_GroupFilterPanel.scss";
3030
@import "./structures/_ToastContainer.scss";
3131
@import "./structures/_UploadBar.scss";
3232
@import "./structures/_UserMenu.scss";

‎res/css/structures/_CustomRoomTagPanel.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ limitations under the License.
2222
}
2323

2424
.mx_CustomRoomTagPanel {
25-
background-color: $tagpanel-bg-color;
25+
background-color: $groupFilterPanel-bg-color;
2626
max-height: 40vh;
2727
}
2828

‎res/css/structures/_TagPanel.scss‎ renamed to ‎res/css/structures/_GroupFilterPanel.scss‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
.mx_TagPanel {
17+
.mx_GroupFilterPanel {
1818
flex: 1;
19-
background-color: $tagpanel-bg-color;
19+
background-color: $groupFilterPanel-bg-color;
2020
cursor: pointer;
2121

2222
display: flex;
@@ -26,49 +26,49 @@ limitations under the License.
2626
min-height: 0;
2727
}
2828

29-
.mx_TagPanel_items_selected {
29+
.mx_GroupFilterPanel_items_selected {
3030
cursor: pointer;
3131
}
3232

33-
.mx_TagPanel .mx_TagPanel_divider {
33+
.mx_GroupFilterPanel .mx_GroupFilterPanel_divider {
3434
height: 0px;
3535
width: 90%;
3636
border: none;
37-
border-bottom: 1px solid $tagpanel-divider-color;
37+
border-bottom: 1px solid $groupFilterPanel-divider-color;
3838
}
3939

40-
.mx_TagPanel .mx_TagPanel_scroller {
40+
.mx_GroupFilterPanel .mx_GroupFilterPanel_scroller {
4141
flex-grow: 1;
4242
width: 100%;
4343
}
4444

45-
.mx_TagPanel .mx_TagPanel_tagTileContainer {
45+
.mx_GroupFilterPanel .mx_GroupFilterPanel_tagTileContainer {
4646
display: flex;
4747
flex-direction: column;
4848
align-items: center;
4949

5050
padding-top: 6px;
5151
}
52-
.mx_TagPanel .mx_TagPanel_tagTileContainer > div {
52+
.mx_GroupFilterPanel .mx_GroupFilterPanel_tagTileContainer > div {
5353
margin: 6px 0;
5454
}
5555

56-
.mx_TagPanel .mx_TagTile {
56+
.mx_GroupFilterPanel .mx_TagTile {
5757
// opacity: 0.5;
5858
position: relative;
5959
}
6060

61-
.mx_TagPanel .mx_TagTile.mx_TagTile_prototype {
61+
.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_prototype {
6262
padding: 3px;
6363
}
6464

65-
.mx_TagPanel .mx_TagTile:focus,
66-
.mx_TagPanel .mx_TagTile:hover,
67-
.mx_TagPanel .mx_TagTile.mx_TagTile_selected {
65+
.mx_GroupFilterPanel .mx_TagTile:focus,
66+
.mx_GroupFilterPanel .mx_TagTile:hover,
67+
.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected {
6868
// opacity: 1;
6969
}
7070

71-
.mx_TagPanel .mx_TagTile.mx_TagTile_selected_prototype {
71+
.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected_prototype {
7272
background-color: $primary-bg-color;
7373
border-radius: 6px;
7474
}
@@ -108,7 +108,7 @@ limitations under the License.
108108
}
109109
}
110110

111-
.mx_TagPanel .mx_TagTile_plus {
111+
.mx_GroupFilterPanel .mx_TagTile_plus {
112112
margin-bottom: 12px;
113113
height: 32px;
114114
width: 32px;
@@ -132,7 +132,7 @@ limitations under the License.
132132
}
133133
}
134134

135-
.mx_TagPanel .mx_TagTile.mx_TagTile_selected::before {
135+
.mx_GroupFilterPanel .mx_TagTile.mx_TagTile_selected::before {
136136
content: '';
137137
height: 100%;
138138
background-color: $accent-color;
@@ -142,7 +142,7 @@ limitations under the License.
142142
border-radius: 0 3px 3px 0;
143143
}
144144

145-
.mx_TagPanel .mx_TagTile.mx_AccessibleButton:focus {
145+
.mx_GroupFilterPanel .mx_TagTile.mx_AccessibleButton:focus {
146146
filter: none;
147147
}
148148

‎res/css/structures/_LeftPanel.scss‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
$tagPanelWidth: 56px; // only applies in this file, used for calculations
17+
$groupFilterPanelWidth: 56px; // only applies in this file, used for calculations
1818

1919
.mx_LeftPanel {
2020
background-color: $roomlist-bg-color;
2121
min-width: 260px;
2222
max-width: 50%;
2323

24-
// Create a row-based flexbox for the TagPanel and the room list
24+
// Create a row-based flexbox for the GroupFilterPanel and the room list
2525
display: flex;
2626

27-
.mx_LeftPanel_tagPanelContainer {
27+
.mx_LeftPanel_GroupFilterPanelContainer {
2828
flex-grow: 0;
2929
flex-shrink: 0;
30-
flex-basis: $tagPanelWidth;
30+
flex-basis: $groupFilterPanelWidth;
3131
height: 100%;
3232

33-
// Create another flexbox so the TagPanel fills the container
33+
// Create another flexbox so the GroupFilterPanel fills the container
3434
display: flex;
3535

36-
// TagPanel handles its own CSS
36+
// GroupFilterPanel handles its own CSS
3737
}
3838

39-
&:not(.mx_LeftPanel_hasTagPanel) {
39+
&:not(.mx_LeftPanel_hasGroupFilterPanel) {
4040
.mx_LeftPanel_roomListContainer {
4141
width: 100%;
4242
}
@@ -45,7 +45,7 @@ $tagPanelWidth: 56px; // only applies in this file, used for calculations
4545
// Note: The 'room list' in this context is actually everything that isn't the tag
4646
// panel, such as the menu options, breadcrumbs, filtering, etc
4747
.mx_LeftPanel_roomListContainer {
48-
width: calc(100% - $tagPanelWidth);
48+
width: calc(100% - $groupFilterPanelWidth);
4949
background-color: $roomlist-bg-color;
5050

5151
// Create another flexbox (this time a column) for the room list components
@@ -169,10 +169,10 @@ $tagPanelWidth: 56px; // only applies in this file, used for calculations
169169
min-width: unset;
170170

171171
// We have to forcefully set the width to override the resizer's style attribute.
172-
&.mx_LeftPanel_hasTagPanel {
173-
width: calc(68px + $tagPanelWidth) !important;
172+
&.mx_LeftPanel_hasGroupFilterPanel {
173+
width: calc(68px + $groupFilterPanelWidth) !important;
174174
}
175-
&:not(.mx_LeftPanel_hasTagPanel) {
175+
&:not(.mx_LeftPanel_hasGroupFilterPanel) {
176176
width: 68px !important;
177177
}
178178

‎res/css/views/rooms/_MemberInfo.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ limitations under the License.
7070
}
7171

7272
.mx_MemberInfo_avatar {
73-
background: $tagpanel-bg-color;
73+
background: $groupFilterPanel-bg-color;
7474
margin-bottom: 16px;
7575
}
7676

‎res/themes/dark/css/_dark.scss‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $info-plinth-fg-color: #888;
3939

4040
$preview-bar-bg-color: $header-panel-bg-color;
4141

42-
$tagpanel-bg-color: rgba(38, 39, 43, 0.82);
42+
$groupFilterPanel-bg-color: rgba(38, 39, 43, 0.82);
4343
$inverted-bg-color: $base-color;
4444

4545
// used by AddressSelector
@@ -98,7 +98,7 @@ $roomheader-color: $text-primary-color;
9898
$roomheader-bg-color: $bg-color;
9999
$roomheader-addroom-bg-color: rgba(92, 100, 112, 0.3);
100100
$roomheader-addroom-fg-color: $text-primary-color;
101-
$tagpanel-button-color: $header-panel-text-primary-color;
101+
$groupFilterPanel-button-color: $header-panel-text-primary-color;
102102
$groupheader-button-color: $header-panel-text-primary-color;
103103
$rightpanel-button-color: $header-panel-text-primary-color;
104104
$icon-button-color: #8E99A4;
@@ -118,7 +118,7 @@ $roomlist-bg-color: rgba(33, 38, 44, 0.90);
118118
$roomlist-header-color: $tertiary-fg-color;
119119
$roomsublist-divider-color: $primary-fg-color;
120120

121-
$tagpanel-divider-color: $roomlist-header-color;
121+
$groupFilterPanel-divider-color: $roomlist-header-color;
122122

123123
$roomtile-preview-color: $secondary-fg-color;
124124
$roomtile-default-badge-bg-color: #61708b;
@@ -187,7 +187,7 @@ $reaction-row-button-selected-border-color: $accent-color;
187187

188188
$kbd-border-color: #000000;
189189

190-
$tooltip-timeline-bg-color: $tagpanel-bg-color;
190+
$tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
191191
$tooltip-timeline-fg-color: #ffffff;
192192

193193
$interactive-tooltip-bg-color: $base-color;
@@ -202,7 +202,7 @@ $appearance-tab-border-color: $room-highlight-color;
202202

203203
// blur amounts for left left panel (only for element theme, used in _mods.scss)
204204
$roomlist-background-blur-amount: 60px;
205-
$tagpanel-background-blur-amount: 30px;
205+
$groupFilterPanel-background-blur-amount: 30px;
206206

207207
$composer-shadow-color: rgba(0, 0, 0, 0.28);
208208

‎res/themes/dark/css/dark.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
@import "../../light/css/_fonts.scss";
44
@import "../../light/css/_light.scss";
55
// important this goes before _mods,
6-
// as $tagpanel-background-blur-amount and
6+
// as $groupFilterPanel-background-blur-amount and
77
// $roomlist-background-blur-amount
88
// are overridden in _dark.scss
99
@import "_dark.scss";

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ $info-plinth-fg-color: #888;
3737

3838
$preview-bar-bg-color: $header-panel-bg-color;
3939

40-
$tagpanel-bg-color: $base-color;
41-
$inverted-bg-color: $tagpanel-bg-color;
40+
$groupFilterPanel-bg-color: $base-color;
41+
$inverted-bg-color: $groupFilterPanel-bg-color;
4242

4343
// used by AddressSelector
4444
$selected-color: $room-highlight-color;
@@ -95,7 +95,7 @@ $topleftmenu-color: $text-primary-color;
9595
$roomheader-color: $text-primary-color;
9696
$roomheader-addroom-bg-color: #3c4556; // $search-placeholder-color at 0.5 opacity
9797
$roomheader-addroom-fg-color: $text-primary-color;
98-
$tagpanel-button-color: $header-panel-text-primary-color;
98+
$groupFilterPanel-button-color: $header-panel-text-primary-color;
9999
$groupheader-button-color: $header-panel-text-primary-color;
100100
$rightpanel-button-color: $header-panel-text-primary-color;
101101
$icon-button-color: $header-panel-text-primary-color;
@@ -115,7 +115,7 @@ $roomlist-bg-color: $header-panel-bg-color;
115115

116116
$roomsublist-divider-color: $primary-fg-color;
117117

118-
$tagpanel-divider-color: $roomlist-header-color;
118+
$groupFilterPanel-divider-color: $roomlist-header-color;
119119

120120
$roomtile-preview-color: #9e9e9e;
121121
$roomtile-default-badge-bg-color: #61708b;
@@ -182,7 +182,7 @@ $reaction-row-button-selected-border-color: $accent-color;
182182

183183
$kbd-border-color: #000000;
184184

185-
$tooltip-timeline-bg-color: $tagpanel-bg-color;
185+
$tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
186186
$tooltip-timeline-fg-color: #ffffff;
187187

188188
$interactive-tooltip-bg-color: $base-color;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ $preview-bar-bg-color: #f7f7f7;
6767
$secondary-accent-color: #f2f5f8;
6868
$tertiary-accent-color: #d3efe1;
6969

70-
$tagpanel-bg-color: #27303a;
71-
$inverted-bg-color: $tagpanel-bg-color;
70+
$groupFilterPanel-bg-color: #27303a;
71+
$inverted-bg-color: $groupFilterPanel-bg-color;
7272

7373
// used by RoomDirectory permissions
7474
$plinth-bg-color: $secondary-accent-color;
@@ -162,7 +162,7 @@ $roomheader-color: #45474a;
162162
$roomheader-bg-color: $primary-bg-color;
163163
$roomheader-addroom-bg-color: #91a1c0;
164164
$roomheader-addroom-fg-color: $accent-fg-color;
165-
$tagpanel-button-color: #91a1c0;
165+
$groupFilterPanel-button-color: #91a1c0;
166166
$groupheader-button-color: #91a1c0;
167167
$rightpanel-button-color: #91a1c0;
168168
$icon-button-color: #91a1c0;
@@ -182,7 +182,7 @@ $roomlist-bg-color: $header-panel-bg-color;
182182
$roomlist-header-color: $primary-fg-color;
183183
$roomsublist-divider-color: $primary-fg-color;
184184

185-
$tagpanel-divider-color: $roomlist-header-color;
185+
$groupFilterPanel-divider-color: $roomlist-header-color;
186186

187187
$roomtile-preview-color: #9e9e9e;
188188
$roomtile-default-badge-bg-color: #61708b;
@@ -305,7 +305,7 @@ $reaction-row-button-selected-border-color: $accent-color;
305305

306306
$kbd-border-color: $reaction-row-button-border-color;
307307

308-
$tooltip-timeline-bg-color: $tagpanel-bg-color;
308+
$tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
309309
$tooltip-timeline-fg-color: #ffffff;
310310

311311
$interactive-tooltip-bg-color: #27303a;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ $roomtile-selected-bg-color: var(--roomlist-highlights-color);
4949
//
5050
// --sidebar-color
5151
$interactive-tooltip-bg-color: var(--sidebar-color);
52-
$tagpanel-bg-color: var(--sidebar-color);
52+
$groupFilterPanel-bg-color: var(--sidebar-color);
5353
$tooltip-timeline-bg-color: var(--sidebar-color);
5454
$dialog-backdrop-color: var(--sidebar-color-50pct);
5555
$roomlist-button-bg-color: var(--sidebar-color-15pct);

0 commit comments

Comments
 (0)