From 78cabed0bfb9d9815dce54707bf615cd7ae5f50a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 25 Apr 2017 16:24:00 +0100
Subject: [PATCH] Modify CSS for matrix-org/matrix-react-sdk#833

---
 .../structures/_UserSettings.scss             |  9 ++++++++
 .../structures/login/_Login.scss              | 22 ++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
index 9f33e1bc..739ac88a 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
@@ -176,6 +176,15 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_UserSettings_phoneSection {
+    display:table;
+}
+
+.mx_UserSettings_phoneCountry {
+    width: 70px;
+    display: table-cell;
+}
+
 input.mx_UserSettings_phoneNumberField {
     margin-left: 3px;
     width: 172px;
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
index 12430480..93173ed3 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
@@ -179,11 +179,11 @@ limitations under the License.
     align-self: flex-end;
 }
 
-.mx_Login_username_group {
+.mx_Login_field_group {
     display: flex;
 }
 
-.mx_Login_username_prefix {
+.mx_Login_field_prefix {
     height: 33px;
     padding: 0px 5px;
     line-height: 33px;
@@ -196,7 +196,7 @@ limitations under the License.
     text-align: center;
 }
 
-.mx_Login_username_suffix {
+.mx_Login_field_suffix {
     height: 33px;
     padding: 0px 5px;
     line-height: 33px;
@@ -214,7 +214,9 @@ limitations under the License.
     flex-shrink: 1;
     min-width: 0px;
     border-radius: 3px;
-    /* The "@" is always prefixed, so no rounded corners */
+}
+
+.mx_Login_field_has_prefix {
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
 }
@@ -224,13 +226,8 @@ limitations under the License.
     border-bottom-right-radius: 0px;
 }
 
-.mx_Login_phoneSection {
-    display: table;
-}
-
 .mx_Login_phoneCountry {
-    display: table-cell;
-    width: 70px;
+    margin-bottom: 14px;
 }
 
 .mx_Login_phoneCountry .mx_Dropdown_option {
@@ -246,8 +243,3 @@ limitations under the License.
     margin: 4px;
     vertical-align: top;
 }
-
-.mx_Login_phoneNumberField {
-    width: 210px;
-    margin-left: 3px;
-}