From 027ab6ee997fde9261f659ea1352be01a5ca1e82 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 1 Sep 2015 01:55:13 +0300 Subject: [PATCH] fix login layout on tall screens; limit dialog box width; wait a full second to re-query new HS details --- skins/base/css/common.css | 1 + skins/base/css/templates/Login.css | 11 ++--------- skins/base/views/templates/Login.js | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/skins/base/css/common.css b/skins/base/css/common.css index 32f915e9..d90ce11a 100644 --- a/skins/base/css/common.css +++ b/skins/base/css/common.css @@ -83,6 +83,7 @@ html { font-size: 16px; position: relative; border-radius: 8px; + max-width: 75%; } .mx_ImageView { diff --git a/skins/base/css/templates/Login.css b/skins/base/css/templates/Login.css index 49feffbe..7362ac50 100644 --- a/skins/base/css/templates/Login.css +++ b/skins/base/css/templates/Login.css @@ -17,15 +17,6 @@ limitations under the License. .mx_Login { 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 { @@ -37,6 +28,8 @@ limitations under the License. .mx_Login_box { width: 300px; + margin: auto; + padding-top: 100px; } .mx_Login_logo { diff --git a/skins/base/views/templates/Login.js b/skins/base/views/templates/Login.js index bef13b1d..57b5fbcd 100644 --- a/skins/base/views/templates/Login.js +++ b/skins/base/views/templates/Login.js @@ -110,7 +110,7 @@ module.exports = React.createClass({ var self = this; this.updateHsTimeout = setTimeout(function() { self.onHSChosen(); - }, 500); + }, 1000); }, componentForStep: function(step) {