From 1e139ef183b02f3602667fe810c6c32b9dfe8ffd Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 21 Apr 2017 17:03:31 +0100
Subject: [PATCH 1/3] Cosmetics to go with matrix-org/matrix-react-sdk#811

---
 .../views/login/VectorLoginHeader.js          |  5 +-
 src/skins/vector/css/_common.scss             |  2 +-
 .../structures/login/_Login.scss              | 78 ++++++++++++++++++-
 .../views/elements/_Dropdown.scss             |  6 +-
 4 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/src/components/views/login/VectorLoginHeader.js b/src/components/views/login/VectorLoginHeader.js
index daa2b09c..1b071c6a 100644
--- a/src/components/views/login/VectorLoginHeader.js
+++ b/src/components/views/login/VectorLoginHeader.js
@@ -18,6 +18,9 @@ limitations under the License.
 
 var React = require('react');
 
+const i = [1, 2, 3, 4, 5][Math.floor(Math.random() * 5)];
+const DEFAULT_LOGO_URI = "img/logos/riot-logo-" + i + ".svg";
+
 module.exports = React.createClass({
     displayName: 'VectorLoginHeader',
     statics: {
@@ -30,7 +33,7 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mx_Login_logo">
-                <img src={this.props.icon || "img/logo.png"} alt="Riot"/>
+                <img src={this.props.icon || DEFAULT_LOGO_URI} alt="Riot"/>
             </div>
         );
     }
diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss
index a44a503e..43cd702c 100644
--- a/src/skins/vector/css/_common.scss
+++ b/src/skins/vector/css/_common.scss
@@ -65,7 +65,7 @@ input[type=text].error, input[type=password].error {
     border: 1px solid $warning-color;
 }
 
-input[type=text]:focus, textarea:focus {
+input[type=text]:focus, input[type=password]:focus, textarea:focus {
     border: 1px solid $accent-color;
     outline: none;
     box-shadow: none;
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 f21bb169..1a27b29b 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
@@ -66,10 +66,6 @@ limitations under the License.
     margin-bottom: 14px;
 }
 
-.mx_Login_username {
-    margin-bottom: 0px;
-}
-
 .mx_Login_fieldLabel {
     margin-top: -10px;
     margin-left: 8px;
@@ -167,6 +163,66 @@ limitations under the License.
     margin-bottom: 12px;
 }
 
+.mx_Login_type_container {
+    display: flex;
+    margin-bottom: 14px;
+}
+
+.mx_Login_type_label {
+    flex-grow: 1;
+    line-height: 35px;
+}
+
+.mx_Login_type_dropdown {
+    width: 125px;
+    align-self: flex-end;
+}
+
+.mx_Login_username_group {
+    display: flex;
+}
+
+.mx_Login_username_prefix {
+    height: 33px;
+    padding: 0px 5px;
+    line-height: 33px;
+
+    background-color: #eee;
+    border: 1px solid #c7c7c7;
+    border-right: 0px;
+    border-radius: 3px 0px 0px 3px;
+
+    text-align: center;
+}
+
+.mx_Login_username_suffix {
+    height: 33px;
+    padding: 0px 5px;
+    line-height: 33px;
+
+    background-color: #eee;
+    border: 1px solid #c7c7c7;
+    border-left: 0px;
+    border-radius: 0px 3px 3px 0px;
+
+    text-align: center;
+    flex-grow: 1;
+}
+
+.mx_Login_username {
+    flex-shrink: 1;
+    min-width: 0px;
+    border-radius: 3px;
+    /* The "@" is always prefixed, so no rounded corners */
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+}
+
+.mx_Login_field_has_suffix {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
 .mx_Login_phoneSection {
     display: table;
 }
@@ -176,6 +232,20 @@ limitations under the License.
     width: 70px;
 }
 
+.mx_Login_phoneCountry .mx_Dropdown_option {
+    /*
+        To match height of mx_Login_field
+        33px + 2px border from mx_Dropdown_option = 35px
+    */
+    height: 33px;
+    line-height: 33px;
+}
+
+.mx_Login_phoneCountry .mx_Dropdown_option img {
+    margin: 4px;
+    vertical-align: top;
+}
+
 .mx_Login_phoneNumberField {
     width: 210px;
     margin-left: 3px;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss
index b96290bd..1f9cbb63 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss
@@ -27,6 +27,10 @@ limitations under the License.
     user-select: none;
 }
 
+.mx_Dropdown_input:focus {
+    border-color: $accent-color;
+}
+
 .mx_Dropdown_arrow {
     border-color: $primary-fg-color transparent transparent;
     border-style: solid;
@@ -74,7 +78,7 @@ input.mx_Dropdown_option, input.mx_Dropdown_option:focus {
     border: 1px solid $accent-color;
     background-color: $primary-bg-color;
     max-height: 200px;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 
 .mx_Dropdown_menu .mx_Dropdown_option_highlight {

From a2b465e352c351380a76a79ea7be619223f9938b Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 21 Apr 2017 17:14:59 +0100
Subject: [PATCH 2/3] Remove old logo

---
 src/skins/vector/img/logo.png | Bin 19338 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/skins/vector/img/logo.png

diff --git a/src/skins/vector/img/logo.png b/src/skins/vector/img/logo.png
deleted file mode 100644
index da6bb327f9e095d562ea627b24e337ac59d7a6f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19338
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


From f010afe63f981fcaa24a9c6fa05192b9f5144f5b Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 21 Apr 2017 17:36:48 +0100
Subject: [PATCH 3/3] Add emojione PNGs to the COPY_LIST

---
 scripts/copy-res.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index 826d9a96..4702d5cf 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -10,6 +10,7 @@ const COPY_LIST = [
     ["res/{media,vector-icons}/**", "webapp"],
     ["src/skins/vector/{fonts,img}/**", "webapp"],
     ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
+    ["node_modules/emojione/assets/png/*", "webapp/emojione/png/"],
     ["./config.json", "webapp", {directwatch: 1}],
 ];