From 7cc27beb4433ea78a95a56dc13b3eb0e8be1caee Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 19 Aug 2019 14:34:22 +0100
Subject: [PATCH 1/3] Remove custom font size for IM URL

As best as I can tell, the designs call for the IM URL to be the same size as
other subheadings. The font size in Zeplin doesn't match what is currently used
in Settings, so this likely caused confusion.
---
 res/css/views/settings/_SetIntegrationManager.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/settings/_SetIntegrationManager.scss b/res/css/views/settings/_SetIntegrationManager.scss
index 7fda042864..d532492ea8 100644
--- a/res/css/views/settings/_SetIntegrationManager.scss
+++ b/res/css/views/settings/_SetIntegrationManager.scss
@@ -30,5 +30,4 @@ limitations under the License.
 .mx_SetIntegrationManager > .mx_SettingsTab_heading > .mx_SettingsTab_subheading {
     display: inline-block;
     padding-left: 5px;
-    font-size: 14px;
 }

From 5af9bf7b8035dd086e797dbf40ea735f4c67ee2e Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 19 Aug 2019 14:44:53 +0100
Subject: [PATCH 2/3] Use designed text for new IS field

---
 src/components/views/settings/SetIdServer.js | 2 +-
 src/i18n/strings/en_EN.json                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index c0d103a219..38e8f3dd51 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -263,7 +263,7 @@ export default class SetIdServer extends React.Component {
                 <span className="mx_SettingsTab_subsectionText">
                     {bodyText}
                 </span>
-                <Field label={_t("Identity Server")}
+                <Field label={_t("Enter a new identity server")}
                     id="mx_SetIdServer_idServer"
                     type="text" value={this.state.idServer} autoComplete="off"
                     onChange={this._onIdentityServerChanged}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 89d9026fcf..b1f40b7822 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -557,6 +557,7 @@
     "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.",
     "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",
     "Failed to update integration manager": "Failed to update integration manager",
     "Integration manager offline or not accessible.": "Integration manager offline or not accessible.",

From 8a7b43fd1ad86d5b5e7b843938ffabf58f490b66 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 19 Aug 2019 15:45:04 +0100
Subject: [PATCH 3/3] Tweak Settings padding / margin slightly

This makes a few small tweaks to Settings padding and margin, but more is still
needed. I am told that https://github.com/vector-im/riot-web/issues/10554 will
soon take a holistic view on the problem, so this is a more conservation
temporary change.
---
 res/css/views/settings/tabs/_SettingsTab.scss | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 7755ee6053..84ff91d341 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -24,6 +24,10 @@ limitations under the License.
     color: $primary-fg-color;
 }
 
+.mx_SettingsTab_heading:nth-child(n + 2) {
+    margin-top: 30px;
+}
+
 .mx_SettingsTab_subheading {
     font-size: 16px;
     display: block;
@@ -37,9 +41,8 @@ limitations under the License.
 .mx_SettingsTab_subsectionText {
     color: $settings-subsection-fg-color;
     font-size: 14px;
-    padding-bottom: 12px;
     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 {
@@ -68,9 +71,14 @@ limitations under the License.
 }
 
 .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
     // give them more visual distinction between the sections.
-    margin-top: 30px;
+    margin-top: 25px;
 }
 
 .mx_SettingsTab a {