PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Iterate PR based on feedback

Browse source
This commit is contained in:
Michael Telatynski 2021-08-10 09:55:51 +01:00
parent db951b43a3
commit 195b8714fc
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
res/css/views/settings/tabs/_SettingsTab.scss
View file

@ -50,15 +50,21 @@ limitations under the License.
} }
.mx_SettingsTab_section { .mx_SettingsTab_section {
$right-gutter: 80px;
margin-bottom: 24px; margin-bottom: 24px;
.mx_SettingsFlag { .mx_SettingsFlag {
margin-right: 80px; margin-right: $right-gutter;
margin-bottom: 10px; margin-bottom: 10px;
} }
> p {
margin-right: $right-gutter;
}
&.mx_SettingsTab_subsectionText .mx_SettingsFlag { &.mx_SettingsTab_subsectionText .mx_SettingsFlag {
margin-right: 0px !important; margin-right: 0 !important;
} }
} }

1
res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
View file

@ -31,6 +31,7 @@ limitations under the License.
font-size: $font-15px; font-size: $font-15px;
line-height: $font-18px; line-height: $font-18px;
color: $primary-fg-color; color: $primary-fg-color;
margin: 16px 0;
.mx_BaseAvatar { .mx_BaseAvatar {
margin-right: 12px; margin-right: 12px;

5
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
View file

@ -341,9 +341,8 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
<div className="mx_SettingsTab_section"> <div className="mx_SettingsTab_section">
<span className="mx_SettingsTab_subheading">{ _t("Communities") }</span> <span className="mx_SettingsTab_subheading">{ _t("Communities") }</span>
<p>{ _t("Communities have been archived to make way for Spaces but you can convert your " + <p>{ _t("Communities have been archived to make way for Spaces but you can convert your " +
"communities into Spaces below.") }</p> "communities into Spaces below. Converting will ensure your conversations get the latest " +
<span>{ _t("Convert your Communities to Spaces") }</span> "features.") }</p>
<p>{ _t("Converting will ensure your conversations get the latest features.") }</p>
<details> <details>
<summary>{ _t("Show my Communities") }</summary> <summary>{ _t("Show my Communities") }</summary>
<p>{ _t("If a community isn't shown you may not have permission to convert it.") }</p> <p>{ _t("If a community isn't shown you may not have permission to convert it.") }</p>

4
src/i18n/strings/en_EN.json
View file

@ -1342,9 +1342,7 @@
"Preferences": "Preferences", "Preferences": "Preferences",
"Room list": "Room list", "Room list": "Room list",
"Communities": "Communities", "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.", "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.",
"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.",
"Show my Communities": "Show my Communities", "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.", "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", "Keyboard shortcuts": "Keyboard shortcuts",