Standardise the margin for settings tabs (#7963)

yuktea · t3chguy · web-flow · commit ab26aad40605 · 2022-05-12T10:09:17.000+01:00
Co-authored-by: Michael Telatynski &lt;7t3chguy@gmail.com&gt;
diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss
@@ -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 {
diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -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) {
diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -21,6 +21,7 @@ limitations under the License.
 .mx_AppearanceUserSettingsTab {
     > .mx_SettingsTab_SubHeading {
         margin-bottom: 32px;
+        margin-top: 12px;
     }
 }
 
diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
@@ -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;
diff --git a/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_SidebarUserSettingsTab {
     .mx_SettingsTab_section {
-        margin-top: 10px;
+        margin-top: 12px;
     }
 
     .mx_SidebarUserSettingsTab_subheading {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ limitations under the License.`
`27`	`27`	`font-weight: 600;`
`28`	`28`	`color: $primary-content;`
`29`	`29`	`margin-bottom: 10px;`
	`30`	`+ margin-top: 10px;`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`.mx_SettingsTab_heading:nth-child(n + 2) {`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ limitations under the License.`
`21`	`21`	`.mx_AppearanceUserSettingsTab {`
`22`	`22`	`> .mx_SettingsTab_SubHeading {`
`23`	`23`	`margin-bottom: 32px;`
	`24`	`+ margin-top: 12px;`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@ limitations under the License.`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`.mx_SecurityUserSettingsTab {`
	`30`	`+ .mx_SettingsTab_heading {`
	`31`	`+ margin-bottom: 22px;`
	`32`	`+ }`
`30`	`33`	`.mx_SettingsTab_section {`
`31`	`34`	`.mx_AccessibleButton_kind_link {`
`32`	`35`	`padding: 0;`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ limitations under the License.`
`16`	`16`
`17`	`17`	`.mx_SidebarUserSettingsTab {`
`18`	`18`	`.mx_SettingsTab_section {`
`19`		`- margin-top: 10px;`
	`19`	`+ margin-top: 12px;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`.mx_SidebarUserSettingsTab_subheading {`