From d239070adbe60e8a3a84c8cbe69107b7ee6648d6 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 19 Jul 2015 03:19:37 +0100 Subject: [PATCH] implement login --- skins/base/css/molecules/ServerConfig.css | 31 ++++++++ skins/base/css/templates/Login.css | 79 ++++++++++++++++++++- skins/base/img/logo.png | Bin 0 -> 14893 bytes skins/base/views/molecules/ServerConfig.js | 17 ++--- skins/base/views/templates/Login.js | 31 ++++---- skins/base/views/templates/Register.js | 11 ++- 6 files changed, 139 insertions(+), 30 deletions(-) create mode 100644 skins/base/css/molecules/ServerConfig.css create mode 100644 skins/base/img/logo.png diff --git a/skins/base/css/molecules/ServerConfig.css b/skins/base/css/molecules/ServerConfig.css new file mode 100644 index 000000000..db0572c84 --- /dev/null +++ b/skins/base/css/molecules/ServerConfig.css @@ -0,0 +1,31 @@ +/* +Copyright 2015 OpenMarket Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_ServerConfig { + margin-top: 7px; +} + +.mx_ServerConfig .mx_Login_field { + margin-top: 4px; + margin-bottom: 5px; +} + +.mx_ServerConfig_help:link { + opacity: 0.8; + font-size: 14px; + font-weight: 300; + color: #4a4a4a; +} \ No newline at end of file diff --git a/skins/base/css/templates/Login.css b/skins/base/css/templates/Login.css index 7dbcde1ca..b8cab4a49 100644 --- a/skins/base/css/templates/Login.css +++ b/skins/base/css/templates/Login.css @@ -15,8 +15,81 @@ limitations under the License. */ .mx_Login { - width: 600px; - height: 350px; - position: relative; + width: 100%; + height: 100%; + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + -webkit-align-items: center; + align-items: center; + -webkit-justify-content: center; + justify-content: center; +} + +.mx_Login h2 { + color: #4a4a4a; + font-weight: 300; + margin-top: 32px; + margin-bottom: 20px; +} + +.mx_Login_box { + width: 300px; +} + +.mx_Login_logo { + text-align: center; +} + +.mx_Login_field { + width: 100%; + border-radius: 3px; + border: 1px solid #c7c7c7; + font-weight: 300; + font-size: 14px; + padding: 9px; + margin-bottom: 14px; +} + +.mx_Login_submit { + margin-top: 35px; + margin-bottom: 24px; + width: 100%; + border-radius: 40px; + height: 40px; + border: 0px; + background-color: #76cfa6; + font-size: 16px; + color: #fff; +} + +.mx_Login_label { + font-size: 14px; + opacity: 0.8; +} + +.mx_Login_advanced_checkbox { + margin-right: 10px; +} + +.mx_Login_create { + display: block; + text-align: center; + width: 100%; + font-size: 14px; + opacity: 0.8; +} + +.mx_Login_error { + color: #ff2020; + font-weight: bold; + text-align: center; + margin-bottom: 24px; +} + +.mx_Login_create:link { + color: #4a4a4a; } diff --git a/skins/base/img/logo.png b/skins/base/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..7cea081a8f452453d0f471a4510dd31d9af95d6c GIT binary patch literal 14893 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 fBE13h{{OD literal 0 HcmV?d00001 diff --git a/skins/base/views/molecules/ServerConfig.js b/skins/base/views/molecules/ServerConfig.js index e06536c55..c533cf94c 100644 --- a/skins/base/views/molecules/ServerConfig.js +++ b/skins/base/views/molecules/ServerConfig.js @@ -26,17 +26,12 @@ module.exports = React.createClass({ render: function() { return ( -
- - - - - - - - - -
Home Server URL
Identity Server URL
+
+ + + + + What does this mean?
); } diff --git a/skins/base/views/templates/Login.js b/skins/base/views/templates/Login.js index 0fd64ce59..ee7273b80 100644 --- a/skins/base/views/templates/Login.js +++ b/skins/base/views/templates/Login.js @@ -111,13 +111,13 @@ module.exports = React.createClass({ } return (
- - Use custom server options (advanced) + +
- +
); @@ -126,10 +126,10 @@ module.exports = React.createClass({ return (
-
-
+
+
{this.componentForStep('choose_hs')} - +
); @@ -144,10 +144,10 @@ module.exports = React.createClass({ } else { return (
-

Please log in:

+

Sign in

{this.componentForStep(this.state.step)} -
{this.state.errorText}
- Create a new account +
{this.state.errorText}
+ Create a new account
); } @@ -156,7 +156,12 @@ module.exports = React.createClass({ render: function() { return (
- {this.loginContent()} +
+
+ vector +
+ {this.loginContent()} +
); } diff --git a/skins/base/views/templates/Register.js b/skins/base/views/templates/Register.js index 233673786..866f777be 100644 --- a/skins/base/views/templates/Register.js +++ b/skins/base/views/templates/Register.js @@ -129,7 +129,7 @@ module.exports = React.createClass({ case 'stage_m.login.recaptcha': return (
- This Home Server would like to make sure you're not a robot + This Home Server would like to make sure you are not a robot
); @@ -180,8 +180,13 @@ module.exports = React.createClass({ render: function() { return ( -
- {this.registerContent()} +
+
+
+ vector +
+ {this.registerContent()} +
); }