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

Merge pull request #3325 from matrix-org/jryans/tweak-privacy-copy

Browse source 
Tweak privacy settings copy and whitespace
This commit is contained in:
J. Ryan Stinnett 2019-08-19 21:35:49 +01:00 committed by GitHub
commit fef3438ef1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/css/views/settings/_SetIntegrationManager.scss
View file

@ -30,5 +30,4 @@ limitations under the License.
.mx_SetIntegrationManager > .mx_SettingsTab_heading > .mx_SettingsTab_subheading { .mx_SetIntegrationManager > .mx_SettingsTab_heading > .mx_SettingsTab_subheading {
display: inline-block; display: inline-block;
padding-left: 5px; padding-left: 5px;
font-size: 14px;
} }

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

@ -24,6 +24,10 @@ limitations under the License.
color: $primary-fg-color; color: $primary-fg-color;
} }
.mx_SettingsTab_heading:nth-child(n + 2) {
margin-top: 30px;
}
.mx_SettingsTab_subheading { .mx_SettingsTab_subheading {
font-size: 16px; font-size: 16px;
display: block; display: block;
@ -37,9 +41,8 @@ limitations under the License.
.mx_SettingsTab_subsectionText { .mx_SettingsTab_subsectionText {
color: $settings-subsection-fg-color; color: $settings-subsection-fg-color;
font-size: 14px; font-size: 14px;
padding-bottom: 12px;
display: block; display: block;
margin: 0 100px 0 0; // Align with the rest of the view margin: 10px 100px 10px 0; // Align with the rest of the view
} }
.mx_SettingsTab_section .mx_SettingsFlag { .mx_SettingsTab_section .mx_SettingsFlag {
@ -68,9 +71,14 @@ limitations under the License.
} }
.mx_SettingsTab .mx_SettingsTab_subheading:nth-child(n + 2) { .mx_SettingsTab .mx_SettingsTab_subheading:nth-child(n + 2) {
// TODO: This `nth-child(n + 2)` isn't working very well since many sections
// add intermediate elements (mostly because our version of React requires
// them) which throws off the numbering and results in many subheading
// missing margins.
// See also https://github.com/vector-im/riot-web/issues/10554
// These views have a lot of the same repetitive information on it, so // These views have a lot of the same repetitive information on it, so
// give them more visual distinction between the sections. // give them more visual distinction between the sections.
margin-top: 30px; margin-top: 25px;
} }
.mx_SettingsTab a { .mx_SettingsTab a {

2
src/components/views/settings/SetIdServer.js
View file

@ -333,7 +333,7 @@ export default class SetIdServer extends React.Component {
<span className="mx_SettingsTab_subsectionText"> <span className="mx_SettingsTab_subsectionText">
{bodyText} {bodyText}
</span> </span>
<Field label={_t("Identity Server")} <Field label={_t("Enter a new identity server")}
id="mx_SetIdServer_idServer" id="mx_SetIdServer_idServer"
type="text" type="text"
autoComplete="off" autoComplete="off"

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

@ -561,6 +561,7 @@
"Identity Server": "Identity Server", "Identity Server": "Identity Server",
"You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.", "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.",
"Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.", "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.",
"Enter a new identity server": "Enter a new identity server",
"Change": "Change", "Change": "Change",
"Failed to update integration manager": "Failed to update integration manager", "Failed to update integration manager": "Failed to update integration manager",
"Integration manager offline or not accessible.": "Integration manager offline or not accessible.", "Integration manager offline or not accessible.": "Integration manager offline or not accessible.",