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

Standardise the margin for settings tabs #7963

Merged
merged 5 commits into from
May 12, 2022
Merged

Standardise the margin for settings tabs #7963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a63183
Standardise the margin for settings tabs
yuktea Mar 3, 2022
bd3d460
Fix style
yuktea Mar 3, 2022
417be34
Remove empty line to pass the style check
yuktea Mar 3, 2022
81b3820
Add end of source blank line
yuktea Mar 3, 2022
3325956
Merge branch 'develop' into standardise-settings-tab-margins
t3chguy May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions res/css/views/settings/_ProfileSettings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ limitations under the License.
.mx_ProfileSettings_controls {
flex-grow: 1;
margin-right: 54px;

// We put the header under the controls with some minor styling to cheat
// alignment of the field with the avatar
.mx_SettingsTab_subheading {
margin-top: 0;
}
}

.mx_ProfileSettings_controls .mx_Field #profileTopic {
Expand Down
1 change: 1 addition & 0 deletions res/css/views/settings/tabs/_SettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ limitations under the License.
font-weight: 600;
color: $primary-content;
margin-bottom: 10px;
margin-top: 10px;
}

.mx_SettingsTab_heading:nth-child(n + 2) {
Expand Down
1 change: 1 addition & 0 deletions res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ limitations under the License.
.mx_AppearanceUserSettingsTab {
> .mx_SettingsTab_SubHeading {
margin-bottom: 32px;
margin-top: 12px;
}
}

Expand Down
3 changes: 3 additions & 0 deletions res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ limitations under the License.
}

.mx_SecurityUserSettingsTab {
.mx_SettingsTab_heading {
margin-bottom: 22px;
}
.mx_SettingsTab_section {
.mx_AccessibleButton_kind_link {
padding: 0;
Expand Down
2 changes: 1 addition & 1 deletion res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

.mx_SidebarUserSettingsTab {
.mx_SettingsTab_section {
margin-top: 10px;
margin-top: 12px;
}

.mx_SidebarUserSettingsTab_subheading {
Expand Down