New logo/color for login screen

8 files changed, 18 insertions, 14 deletions

diff --git a/app/assets/images/login-logo.png b/app/assets/images/login-logo.png
index 8c064b12dd0..a61c41303c4 100644
--- a/app/assets/images/login-logo.png
+++ b/app/assets/images/login-logo.png
diff --git a/app/assets/stylesheets/sections/login.scss b/app/assets/stylesheets/sections/login.scss
index e3fe0b436c3..e6fbc837d9e 100644
--- a/app/assets/stylesheets/sections/login.scss
+++ b/app/assets/stylesheets/sections/login.scss
@@ -1,6 +1,6 @@
 /* Login Page */
 body.login-page{
-  background: #EEE;
+  background: #474D57;
   .container .content { padding-top: 5%; }
 }
 
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index e5800025c6d..d85b4ab08b2 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -1,5 +1,4 @@
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "login-box" }) do |f|
-  = image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo"
   %h3 Change your password
   = devise_error_messages!
   = f.hidden_field :reset_password_token
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
deleted file mode 100644
index 0e39f318726..00000000000
--- a/app/views/devise/passwords/new.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| %>
-  <%= image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo" %>
-  <%= devise_error_messages! %>
-  <%= f.email_field :email, placeholder: "Email",  class: "text" %>
-  <br/>
-  <br/>
-  <%= f.submit "Reset password", class: "btn-primary btn"  %>
-  <div class="pull-right"> <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br /></div>
-<% end %>
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
new file mode 100644
index 00000000000..5d47cbc3b83
--- /dev/null
+++ b/app/views/devise/passwords/new.html.haml
@@ -0,0 +1,11 @@
+= 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/
+  %br/
+  = f.submit "Reset password", class: "btn-primary btn"
+  .pull-right
+    = link_to "Sign in", new_session_path(resource_name), class: "btn"
+    %br/
diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml
index 12b0438229b..17a0c8fd79a 100644
--- a/app/views/devise/registrations/new.html.haml
+++ b/app/views/devise/registrations/new.html.haml
@@ -1,5 +1,6 @@
 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
-  = image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo"
+  %h3.page_title Sign Up
+  %br
   = devise_error_messages!
   %div
     = f.text_field :name, class: "text top", placeholder: "Name", required: true
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 8b71ebed5f4..241133662fb 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,6 +1,6 @@
 .login-box
-  = image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo"
-
+  %h3.page_title Sing in
+  %br
   - if ldap_enabled?
     %ul.nav.nav-tabs
       %li.active
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index a9758f19d36..0fa36211739 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -5,4 +5,6 @@
     = render "layouts/flash"
     .container
       .content
+        %center
+          = image_tag image_path "login-logo.png"
         = yield