Minor UI fixes for login page

5 files changed, 14 insertions, 21 deletions

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 39e6728b5b0..48e3898ed5f 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -193,19 +193,6 @@ li.note {
   }
 }
 
-.remember_me {
-  text-align: left;
-
-  input {
-    margin: 0;
-  }
-
-  span {
-    padding-left: 5px;
-  }
-}
-
-
 .rss-icon {
   img {
     width: 24px;
@@ -217,7 +204,6 @@ li.note {
   }
 }
 
-
 .supp_diff_link,
 .show-all-commits {
   cursor: pointer;
diff --git a/app/assets/stylesheets/sections/login.scss b/app/assets/stylesheets/sections/login.scss
index e6fbc837d9e..8d9fd037bce 100644
--- a/app/assets/stylesheets/sections/login.scss
+++ b/app/assets/stylesheets/sections/login.scss
@@ -1,7 +1,7 @@
 /* Login Page */
 body.login-page{
   background: #474D57;
-  .container .content { padding-top: 5%; }
+  .container .content { padding-top: 4%; }
 }
 
 .login-box{
@@ -37,3 +37,11 @@ body.login-page{
 }
 
 .login-box a.forgot{float: right; padding-top: 6px}
+
+.remember_me {
+  text-align: left;
+
+  input {
+    margin: 2px;
+  }
+}
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index 76e164456ec..3df65d037af 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -1,6 +1,5 @@
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
   %h3.page-title Reset password
-  %br
   = devise_error_messages!
   = f.email_field :email, placeholder: "Email",  class: "text"
   %br/
diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml
index 1ca43d5dd08..0c8be9d5c48 100644
--- a/app/views/devise/sessions/_new_base.html.haml
+++ b/app/views/devise/sessions/_new_base.html.haml
@@ -2,12 +2,13 @@
   = f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus"
   = f.password_field :password, class: "text bottom", placeholder: "Password"
   - if devise_mapping.rememberable?
-    .clearfix.inputs-list
+    .clearfix.append-bottom-10
       %label.checkbox.remember_me{for: "user_remember_me"}
         = f.check_box :remember_me
         %span Remember me
-  = f.submit "Sign in", class: "btn-create btn"
-  .pull-right
-    = link_to "Forgot your password?", new_password_path(resource_name), class: "btn"
+  %div
+    = f.submit "Sign in", class: "btn-create btn"
+    .pull-right
+      = link_to "Forgot your password?", new_password_path(resource_name), class: "btn"
 
 
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index caaa51f1100..c6e1d8db577 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,6 +1,5 @@
 .login-box
   %h3.page-title Sign in
-  %br
   - if ldap_enabled?
     %ul.nav.nav-tabs
       %li.active