From 195b8714fc592fd2286bae36e825518a2cec55f8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 10 Aug 2021 09:55:51 +0100
Subject: [PATCH] Iterate PR based on feedback

---
 res/css/views/settings/tabs/_SettingsTab.scss          | 10 ++++++++--
 .../tabs/user/_PreferencesUserSettingsTab.scss         |  1 +
 .../settings/tabs/user/PreferencesUserSettingsTab.tsx  |  5 ++---
 src/i18n/strings/en_EN.json                            |  4 +---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 9f40372690..3290a998ab 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -50,15 +50,21 @@ limitations under the License.
 }
 
 .mx_SettingsTab_section {
+    $right-gutter: 80px;
+
     margin-bottom: 24px;
 
     .mx_SettingsFlag {
-        margin-right: 80px;
+        margin-right: $right-gutter;
         margin-bottom: 10px;
     }
 
+    > p {
+        margin-right: $right-gutter;
+    }
+
     &.mx_SettingsTab_subsectionText .mx_SettingsFlag {
-        margin-right: 0px !important;
+        margin-right: 0 !important;
     }
 }
 
diff --git a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
index efd2548d3d..4cdfa0b40f 100644
--- a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
@@ -31,6 +31,7 @@ limitations under the License.
             font-size: $font-15px;
             line-height: $font-18px;
             color: $primary-fg-color;
+            margin: 16px 0;
 
             .mx_BaseAvatar {
                 margin-right: 12px;
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index 860f42c1e8..21c3ab24ec 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -341,9 +341,8 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                 <div className="mx_SettingsTab_section">
                     <span className="mx_SettingsTab_subheading">{ _t("Communities") }</span>
                     <p>{ _t("Communities have been archived to make way for Spaces but you can convert your " +
-                        "communities into Spaces below.") }</p>
-                    <span>{ _t("Convert your Communities to Spaces") }</span>
-                    <p>{ _t("Converting will ensure your conversations get the latest features.") }</p>
+                        "communities into Spaces below. Converting will ensure your conversations get the latest " +
+                        "features.") }</p>
                     <details>
                         <summary>{ _t("Show my Communities") }</summary>
                         <p>{ _t("If a community isn't shown you may not have permission to convert it.") }</p>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 008cbabac3..a725cdaff7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1342,9 +1342,7 @@
     "Preferences": "Preferences",
     "Room list": "Room list",
     "Communities": "Communities",
-    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below.": "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below.",
-    "Convert your Communities to Spaces": "Convert your Communities to Spaces",
-    "Converting will ensure your conversations get the latest features.": "Converting will ensure your conversations get the latest features.",
+    "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.": "Communities have been archived to make way for Spaces but you can convert your communities into Spaces below. Converting will ensure your conversations get the latest features.",
     "Show my Communities": "Show my Communities",
     "If a community isn't shown you may not have permission to convert it.": "If a community isn't shown you may not have permission to convert it.",
     "Keyboard shortcuts": "Keyboard shortcuts",