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

Commit 55336bf

Browse files
author
Kerry
authored
Use semantic heading in user settings Sidebar & Voip (#10782)
* split SettingsSection out of SettingsTab, replace usage * correct copyright * use semantic headings in GeneralRoomSettingsTab * use SettingsTab and SettingsSubsection in room settings * fix VoipRoomSettingsTab * use SettingsSection components in space settings * settingssubsection text component * use semantic headings in HelpUserSetttings tab * use ExternalLink components for external links * test * strict * lint * semantic heading in labs settings * semantic headings in keyboard settings tab * semantic heading in preferencesusersettingstab * tidying * use new settings components in eventindexpanel * findByTestId * prettier * semantic headings and style refresh for crypto settings * e2e panel * semantic headings and cleanup in Sidebar user settings * semantic heading in voice user settings * sonarcloud bug and test
1 parent d9a61c0 commit 55336bf

File tree

12 files changed

+447
-190
lines changed

12 files changed

+447
-190
lines changed

res/css/_components.pcss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@
348348
@import "./views/settings/tabs/user/_MjolnirUserSettingsTab.pcss";
349349
@import "./views/settings/tabs/user/_SecurityUserSettingsTab.pcss";
350350
@import "./views/settings/tabs/user/_SidebarUserSettingsTab.pcss";
351-
@import "./views/settings/tabs/user/_VoiceUserSettingsTab.pcss";
352351
@import "./views/spaces/_SpaceBasicSettings.pcss";
353352
@import "./views/spaces/_SpaceChildrenPicker.pcss";
354353
@import "./views/spaces/_SpaceCreateMenu.pcss";

res/css/structures/_QuickSettingsButton.pcss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,11 @@ limitations under the License.
113113
}
114114

115115
.mx_QuickSettingsButton_icon {
116+
// TODO remove when all icons have fill=currentColor
116117
* {
117118
fill: $secondary-content;
118119
}
120+
color: $secondary-content;
119121
width: 16px;
120122
height: 16px;
121123
position: absolute;

res/css/views/settings/tabs/user/_SidebarUserSettingsTab.pcss

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

17-
.mx_SidebarUserSettingsTab {
18-
.mx_Checkbox {
19-
margin-top: 12px;
20-
font-size: $font-15px;
21-
line-height: $font-24px;
22-
color: $secondary-content;
23-
}
24-
25-
.mx_SidebarUserSettingsTab_checkboxMicrocopy {
26-
margin-bottom: 12px;
27-
margin-left: 24px;
28-
font-size: $font-15px;
29-
line-height: $font-24px;
30-
color: $secondary-content;
31-
}
32-
33-
.mx_SidebarUserSettingsTab_homeAllRoomsCheckbox {
34-
margin-left: 24px;
35-
36-
& + div {
37-
margin-left: 48px;
38-
}
39-
}
17+
.mx_SidebarUserSettingsTab_homeAllRoomsCheckbox {
18+
margin-left: 24px;
4019

41-
.mx_SidebarUserSettingsTab_homeCheckbox,
42-
.mx_SidebarUserSettingsTab_favouritesCheckbox,
43-
.mx_SidebarUserSettingsTab_peopleCheckbox,
44-
.mx_SidebarUserSettingsTab_orphansCheckbox {
45-
.mx_Checkbox_background + div {
46-
padding-left: 20px;
47-
position: relative;
48-
49-
&::before {
50-
background-color: $secondary-content;
51-
content: "";
52-
mask-repeat: no-repeat;
53-
mask-position: center;
54-
mask-size: contain;
55-
width: 16px;
56-
height: 16px;
57-
position: absolute;
58-
left: 0;
59-
top: 50%;
60-
transform: translateY(-50%);
61-
}
62-
}
63-
}
64-
65-
.mx_SidebarUserSettingsTab_homeCheckbox .mx_Checkbox_background + div::before {
66-
mask-image: url("$(res)/img/element-icons/home.svg");
67-
}
68-
69-
.mx_SidebarUserSettingsTab_favouritesCheckbox .mx_Checkbox_background + div::before {
70-
mask-image: url("$(res)/img/element-icons/roomlist/favorite.svg");
20+
& + div {
21+
margin-left: 48px;
7122
}
23+
}
7224

73-
.mx_SidebarUserSettingsTab_peopleCheckbox .mx_Checkbox_background + div::before {
74-
mask-image: url("$(res)/img/element-icons/room/members.svg");
25+
.mx_SidebarUserSettingsTab_checkbox {
26+
margin-bottom: $spacing-8;
27+
// override checkbox styles˚
28+
label {
29+
align-items: flex-start !important;
7530
}
7631

77-
.mx_SidebarUserSettingsTab_orphansCheckbox .mx_Checkbox_background + div::before {
78-
mask-image: url("$(res)/img/element-icons/roomlist/hash-circle.svg");
32+
svg {
33+
height: 16px;
34+
width: 16px;
35+
margin-right: $spacing-8;
36+
margin-bottom: -1px;
7937
}
8038
}

res/css/views/settings/tabs/user/_VoiceUserSettingsTab.pcss

Lines changed: 0 additions & 23 deletions
This file was deleted.

res/img/element-icons/home.svg

Lines changed: 1 addition & 1 deletion
Loading

res/img/element-icons/room/members.svg

Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)