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

Commit 195b871

Browse files
committed
Iterate PR based on feedback
1 parent db951b4 commit 195b871

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

res/css/views/settings/tabs/_SettingsTab.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,21 @@ limitations under the License.
5050
}
5151

5252
.mx_SettingsTab_section {
53+
$right-gutter: 80px;
54+
5355
margin-bottom: 24px;
5456

5557
.mx_SettingsFlag {
56-
margin-right: 80px;
58+
margin-right: $right-gutter;
5759
margin-bottom: 10px;
5860
}
5961

62+
> p {
63+
margin-right: $right-gutter;
64+
}
65+
6066
&.mx_SettingsTab_subsectionText .mx_SettingsFlag {
61-
margin-right: 0px !important;
67+
margin-right: 0 !important;
6268
}
6369
}
6470

res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ limitations under the License.
3131
font-size: $font-15px;
3232
line-height: $font-18px;
3333
color: $primary-fg-color;
34+
margin: 16px 0;
3435

3536
.mx_BaseAvatar {
3637
margin-right: 12px;

src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,9 +341,8 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
341341
<div className="mx_SettingsTab_section">
342342
<span className="mx_SettingsTab_subheading">{ _t("Communities") }</span>
343343
<p>{ _t("Communities have been archived to make way for Spaces but you can convert your " +
344-
"communities into Spaces below.") }</p>
345-
<span>{ _t("Convert your Communities to Spaces") }</span>
346-
<p>{ _t("Converting will ensure your conversations get the latest features.") }</p>
344+
"communities into Spaces below. Converting will ensure your conversations get the latest " +
345+
"features.") }</p>
347346
<details>
348347
<summary>{ _t("Show my Communities") }</summary>
349348
<p>{ _t("If a community isn't shown you may not have permission to convert it.") }</p>

src/i18n/strings/en_EN.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,9 +1342,7 @@
13421342
"Preferences": "Preferences",
13431343
"Room list": "Room list",
13441344
"Communities": "Communities",
1345-
"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.",
1346-
"Convert your Communities to Spaces": "Convert your Communities to Spaces",
1347-
"Converting will ensure your conversations get the latest features.": "Converting will ensure your conversations get the latest features.",
1345+
"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.",
13481346
"Show my Communities": "Show my Communities",
13491347
"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.",
13501348
"Keyboard shortcuts": "Keyboard shortcuts",

0 commit comments

Comments
 (0)