From de09e7d19c8752b085f17254d4abe86b1f78d795 Mon Sep 17 00:00:00 2001
From: Matthew Harrison-Jones <matthojo@gmail.com>
Date: Thu, 13 Jun 2013 09:38:40 +0100
Subject: [PATCH] Fixes login box being off centred on small screens

Accounted for top offset to keep login container centred. Login container fades in on load.
Tested on a variety of window sizes and appears to be centred on all of them (measured it to make sure).
---
 core/admin/assets/js/admin-ui-temp.js     | 4 ++--
 core/admin/assets/sass/layouts/login.scss | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/admin/assets/js/admin-ui-temp.js b/core/admin/assets/js/admin-ui-temp.js
index 96fbe84622..c89b3564b0 100644
--- a/core/admin/assets/js/admin-ui-temp.js
+++ b/core/admin/assets/js/admin-ui-temp.js
@@ -23,8 +23,8 @@
     $(window).resize(function () {
 
         var loginContainer = $(".js-login-container"),
-            marginTop = Math.round(($(window).height() / 2) - loginContainer.outerHeight());
-        loginContainer.css('margin-top', marginTop);
+            marginTop = Math.floor((loginContainer.parent().height() - loginContainer.height()) / 2) - 15;
+        loginContainer.css('margin-top', marginTop).fadeIn(400);
 
     });
 
diff --git a/core/admin/assets/sass/layouts/login.scss b/core/admin/assets/sass/layouts/login.scss
index 7aadaec499..356ab1377d 100644
--- a/core/admin/assets/sass/layouts/login.scss
+++ b/core/admin/assets/sass/layouts/login.scss
@@ -19,15 +19,16 @@
     }
 
     main { 
-        top: 15px; 
+        top: 15px;
         @include breakpoint($mobile) { top: 0; }
     }
 }//.ghost-login
 
 .login-box {
     max-width: 530px;
-    margin: 240px auto; // TODO: Change this to proper vertical centering with JS
+    margin: 0 auto;
     padding: 0;
+    display: none;
 
     @include breakpoint(630px) {
         max-width: 264px;