Download as
Browse Code »

Commit 5a2111526dd7a255f74c98b95eeefc578ab0f444

Authored by Dmitriy Zaporozhets
1 parent c54d07b9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

New logo/color for login screen

Showing 8 changed files with 18 additions and 14 deletions   Show diff stats
app/assets/images/login-logo.png
View file @5a21115

1.4 KB | W: | H:

9.97 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/assets/stylesheets/sections/login.scss
  Diff comments   View file @5a21115
1 1 /* Login Page */
2 2 body.login-page{
3   - background: #EEE;
  3 + background: #474D57;
4 4 .container .content { padding-top: 5%; }
5 5 }
6 6  
... ...
app/views/devise/passwords/edit.html.haml
  Diff comments   View file @5a21115
1 1 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, class: "login-box" }) do |f|
2   - = image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo"
3 2 %h3 Change your password
4 3 = devise_error_messages!
5 4 = f.hidden_field :reset_password_token
... ...
app/views/devise/passwords/new.html.erb
View file @c54d07b
... ... @@ -1,9 +0,0 @@
1   -<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f| %>
2   - <%= image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo" %>
3   - <%= devise_error_messages! %>
4   - <%= f.email_field :email, placeholder: "Email", class: "text" %>
5   - <br/>
6   - <br/>
7   - <%= f.submit "Reset password", class: "btn-primary btn" %>
8   - <div class="pull-right"> <%= link_to "Sign in", new_session_path(resource_name), class: "btn" %><br /></div>
9   -<% end %>
app/views/devise/passwords/new.html.haml 0 → 100644
  Diff comments   View file @5a21115
... ... @@ -0,0 +1,11 @@
  1 += form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
  2 + %h3.page_title Reset password
  3 + %br
  4 + = devise_error_messages!
  5 + = f.email_field :email, placeholder: "Email", class: "text"
  6 + %br/
  7 + %br/
  8 + = f.submit "Reset password", class: "btn-primary btn"
  9 + .pull-right
  10 + = link_to "Sign in", new_session_path(resource_name), class: "btn"
  11 + %br/
... ...
app/views/devise/registrations/new.html.haml
  Diff comments   View file @5a21115
1 1 = form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: "login-box" }) do |f|
2   - = image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo"
  2 + %h3.page_title Sign Up
  3 + %br
3 4 = devise_error_messages!
4 5 %div
5 6 = f.text_field :name, class: "text top", placeholder: "Name", required: true
... ...
app/views/devise/sessions/new.html.haml
  Diff comments   View file @5a21115
1 1 .login-box
2   - = image_tag "login-logo.png", width: "304", height: "66", class: "login-logo", alt: "Login Logo"
3   -
  2 + %h3.page_title Sing in
  3 + %br
4 4 - if ldap_enabled?
5 5 %ul.nav.nav-tabs
6 6 %li.active
... ...
app/views/layouts/devise.html.haml
  Diff comments   View file @5a21115
... ... @@ -5,4 +5,6 @@
5 5 = render "layouts/flash"
6 6 .container
7 7 .content
  8 + %center
  9 + = image_tag image_path "login-logo.png"
8 10 = yield
... ...