From 1a631831290fc3dd93e41cd2e23ccde8dd064493 Mon Sep 17 00:00:00 2001 From: yuktea <73362292+yuktea@users.noreply.github.com> Date: Thu, 3 Mar 2022 12:55:07 +0530 Subject: [PATCH 1/4] 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. --- res/css/views/settings/_ProfileSettings.scss | 8 +------- res/css/views/settings/tabs/_SettingsTab.scss | 1 + .../settings/tabs/user/_AppearanceUserSettingsTab.scss | 1 + .../settings/tabs/user/_SecurityUserSettingsTab.scss | 6 ++++++ .../views/settings/tabs/user/_SidebarUserSettingsTab.scss | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss index 09509f7d9eb..dd297070582 100644 --- a/res/css/views/settings/_ProfileSettings.scss +++ b/res/css/views/settings/_ProfileSettings.scss @@ -27,13 +27,7 @@ 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; - } + margin-right: 54px; } .mx_ProfileSettings_controls .mx_Field #profileTopic { diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss index cb0d6b249e1..9b187a2f8cb 100644 --- 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 index e967139cd94..e4247b4851d 100644 --- 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 index 80cb72f2547..070fdf223ed 100644 --- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss +++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss @@ -55,3 +55,9 @@ limitations under the License. } } } + +.mx_SecurityUserSettingsTab { + .mx_SettingsTab_heading{ + margin-bottom: 22px; + } +} diff --git a/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss index 42a8f1aaafb..5000f3e9a69 100644 --- 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 { From bd3d460daaf0d07a0b7ad2b2174cd104ee03bfbc Mon Sep 17 00:00:00 2001 From: yuktea <73362292+yuktea@users.noreply.github.com> Date: Thu, 3 Mar 2022 14:25:58 +0530 Subject: [PATCH 2/4] Fix style --- res/css/views/settings/_ProfileSettings.scss | 2 +- .../settings/tabs/user/_SecurityUserSettingsTab.scss | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss index dd297070582..eda73f4146a 100644 --- a/res/css/views/settings/_ProfileSettings.scss +++ b/res/css/views/settings/_ProfileSettings.scss @@ -27,7 +27,7 @@ limitations under the License. .mx_ProfileSettings_controls { flex-grow: 1; - margin-right: 54px; + margin-right: 54px; } .mx_ProfileSettings_controls .mx_Field #profileTopic { diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss index 070fdf223ed..b49fd7c91f5 100644 --- 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; @@ -56,8 +59,3 @@ limitations under the License. } } -.mx_SecurityUserSettingsTab { - .mx_SettingsTab_heading{ - margin-bottom: 22px; - } -} From 417be347990042678a4f589268349af754ae2c37 Mon Sep 17 00:00:00 2001 From: yuktea <73362292+yuktea@users.noreply.github.com> Date: Thu, 3 Mar 2022 14:42:29 +0530 Subject: [PATCH 3/4] Remove empty line to pass the style check --- res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss index b49fd7c91f5..4386c851e35 100644 --- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss +++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss @@ -57,5 +57,4 @@ limitations under the License. mask-image: url('$(res)/img/feather-customised/alert-triangle.svg'); } } -} - +} \ No newline at end of file From 81b382050eda00fdd9463bcc3ced034bef4ae891 Mon Sep 17 00:00:00 2001 From: yuktea <73362292+yuktea@users.noreply.github.com> Date: Thu, 3 Mar 2022 15:14:50 +0530 Subject: [PATCH 4/4] Add end of source blank line --- res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss index 4386c851e35..2f64cde2714 100644 --- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss +++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss @@ -57,4 +57,4 @@ limitations under the License. mask-image: url('$(res)/img/feather-customised/alert-triangle.svg'); } } -} \ No newline at end of file +}