From 565df334713d68561d7983df4884d85301d91063 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sun, 12 Jun 2022 21:25:57 +0900 Subject: [PATCH 1/2] Replace mx_SidebarUserSettingsTab_subheading with mx_SettingsTab_subheading Signed-off-by: Suguru Hirahara --- .../views/settings/tabs/user/_SidebarUserSettingsTab.scss | 7 ------- .../views/settings/tabs/user/SidebarUserSettingsTab.tsx | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss index 5000f3e9a69..13ea13f5e9d 100644 --- a/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss +++ b/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss @@ -19,13 +19,6 @@ limitations under the License. margin-top: 12px; } - .mx_SidebarUserSettingsTab_subheading { - font-size: $font-15px; - line-height: $font-24px; - color: $primary-content; - margin-bottom: 4px; - } - .mx_Checkbox { margin-top: 12px; font-size: $font-15px; diff --git a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx index 1b1fcf47168..0efe65418b4 100644 --- a/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx +++ b/src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx @@ -55,9 +55,8 @@ const SidebarUserSettingsTab = () => { return (
{ _t("Sidebar") }
-
-
{ _t("Spaces to show") }
+
{ _t("Spaces to show") }
{ _t("Spaces are ways to group rooms and people. " + "Alongside the spaces you're in, you can use some pre-built ones too.") } From 94075fac2ab8f99c59d739d6a1642beaece03f0f Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sun, 12 Jun 2022 21:26:48 +0900 Subject: [PATCH 2/2] Remove a specific margin declaration in favor of the default setting of mx_SettingsTab_subheading Signed-off-by: Suguru Hirahara --- res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss index 13ea13f5e9d..f4c248a584a 100644 --- a/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss +++ b/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss @@ -15,10 +15,6 @@ limitations under the License. */ .mx_SidebarUserSettingsTab { - .mx_SettingsTab_section { - margin-top: 12px; - } - .mx_Checkbox { margin-top: 12px; font-size: $font-15px;