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

Commit 1adbf2c

Browse files
committed
Standardise the margin for settings tabs
Modified the top margin for settings tab to be 10px and made the space between the heading and the first subheading consistent at 22px.
1 parent 31f0a37 commit 1adbf2c

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

res/css/views/settings/_ProfileSettings.scss

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,7 @@ limitations under the License.
2727

2828
.mx_ProfileSettings_controls {
2929
flex-grow: 1;
30-
margin-right: 54px;
31-
32-
// We put the header under the controls with some minor styling to cheat
33-
// alignment of the field with the avatar
34-
.mx_SettingsTab_subheading {
35-
margin-top: 0;
36-
}
30+
margin-right: 54px;
3731
}
3832

3933
.mx_ProfileSettings_controls .mx_Field #profileTopic {

res/css/views/settings/tabs/_SettingsTab.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ limitations under the License.
2727
font-weight: 600;
2828
color: $primary-content;
2929
margin-bottom: 10px;
30+
margin-top: 10px;
3031
}
3132

3233
.mx_SettingsTab_heading:nth-child(n + 2) {

res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ limitations under the License.
2121
.mx_AppearanceUserSettingsTab {
2222
> .mx_SettingsTab_SubHeading {
2323
margin-bottom: 32px;
24+
margin-top: 12px;
2425
}
2526
}
2627

res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,9 @@ limitations under the License.
5555
}
5656
}
5757
}
58+
59+
.mx_SecurityUserSettingsTab {
60+
.mx_SettingsTab_heading{
61+
margin-bottom: 22px;
62+
}
63+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
.mx_SidebarUserSettingsTab {
1818
.mx_SettingsTab_section {
19-
margin-top: 10px;
19+
margin-top: 12px;
2020
}
2121

2222
.mx_SidebarUserSettingsTab_subheading {

0 commit comments

Comments
 (0)