Commit d28a27f7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Cleaner UI for login/signup pages

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent cb33279a
...@@ -6,6 +6,21 @@ ...@@ -6,6 +6,21 @@
} }
.login-box{ .login-box{
padding: 0 15px;
.login-heading h3 {
font-weight: 300;
line-height: 2;
}
.login-footer {
margin-top: 10px;
}
.btn {
padding: 12px !important;
@extend .btn-block;
}
} }
.brand-image { .brand-image {
...@@ -19,7 +34,7 @@ ...@@ -19,7 +34,7 @@
} }
} }
.login-logo{ .login-logo {
margin: 10px 0 30px 0; margin: 10px 0 30px 0;
display: block; display: block;
} }
...@@ -64,4 +79,8 @@ ...@@ -64,4 +79,8 @@
color: #a00; color: #a00;
} }
} }
.brand-holder {
border-right: 1px solid #EEE;
}
} }
.login-box.panel.panel-default .login-box
.panel-heading .login-heading
%h3.panel-title Resend confirmation instructions %h3 Resend confirmation instructions
.panel-body .login-body
= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
.devise-errors .devise-errors
= devise_error_messages! = devise_error_messages!
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
= f.email_field :email, placeholder: 'Email', class: "form-control", required: true = f.email_field :email, placeholder: 'Email', class: "form-control", required: true
.clearfix.append-bottom-10 .clearfix.append-bottom-10
= f.submit "Resend confirmation instructions", class: 'btn btn-success' = f.submit "Resend confirmation instructions", class: 'btn btn-success'
.panel-footer .login-footer
= render 'devise/shared/sign_in_link' = render 'devise/shared/sign_in_link'
.login-box.panel.panel-default .login-box
.panel-heading .login-heading
%h3.panel-title Change your password %h3 Change your password
.panel-body .login-body
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
.devise-errors .devise-errors
= devise_error_messages! = devise_error_messages!
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true
.clearfix.append-bottom-10 .clearfix.append-bottom-10
= f.submit "Change my password", class: "btn btn-primary" = f.submit "Change my password", class: "btn btn-primary"
.panel-footer .login-footer
%p %p
= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
= render 'devise/shared/sign_in_link' = render 'devise/shared/sign_in_link'
.login-box.panel.panel-default .login-box
.panel-heading .login-heading
%h3.panel-title Reset password %h3 Reset password
.panel-body .login-body
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
.devise-errors .devise-errors
= devise_error_messages! = devise_error_messages!
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
= f.email_field :email, placeholder: "Email", class: "form-control", required: true = f.email_field :email, placeholder: "Email", class: "form-control", required: true
.clearfix.append-bottom-10 .clearfix.append-bottom-10
= f.submit "Reset password", class: "btn-primary btn" = f.submit "Reset password", class: "btn-primary btn"
.panel-footer .login-footer
= render 'devise/shared/sign_in_link' = render 'devise/shared/sign_in_link'
.login-box.panel.panel-success .login-box
.panel-heading .login-heading
%h3.panel-title Sign up %h3 Sign up
.panel-body .login-body
= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
.devise-errors .devise-errors
= devise_error_messages! = devise_error_messages!
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm password", required: true = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm password", required: true
%div %div
= f.submit "Sign up", class: "btn-create btn" = f.submit "Sign up", class: "btn-create btn"
.panel-footer .login-footer
%p %p
%span.light %span.light
Have an account? Have an account?
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%label.checkbox.remember_me{for: "user_remember_me"} %label.checkbox.remember_me{for: "user_remember_me"}
= f.check_box :remember_me = f.check_box :remember_me
%span Remember me %span Remember me
%div
= f.submit "Sign in", class: "btn-save btn"
.pull-right .pull-right
= link_to "Forgot your password?", new_password_path(resource_name), class: "btn" = link_to "Forgot your password?", new_password_path(resource_name)
%div
= f.submit "Sign in", class: "btn btn-save"
- providers = (enabled_oauth_providers - [:ldap]) - providers = (enabled_oauth_providers - [:ldap])
- if providers.present? - if providers.present?
%hr %div.light-well{:'data-no-turbolink' => 'data-no-turbolink'}
%div{:'data-no-turbolink' => 'data-no-turbolink'}
%span Sign in with: &nbsp; %span Sign in with: &nbsp;
- providers.each do |provider| - providers.each do |provider|
%span %span
......
.login-box.panel.panel-primary .login-box
.panel-heading .login-heading
%h3.panel-title Sign in %h3 Sign in
.panel-body .login-body
- if ldap_enabled? && gitlab_config.signin_enabled - if ldap_enabled? && gitlab_config.signin_enabled
%ul.nav.nav-tabs %ul.nav.nav-tabs
%li.active %li.active
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
= render 'devise/sessions/oauth_providers' if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable? = render 'devise/sessions/oauth_providers' if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable?
.panel-footer .login-footer
- if gitlab_config.signup_enabled - if gitlab_config.signup_enabled
%p %p
%span.light %span.light
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.container .container
.content .content
.row .row
.col-md-7 .col-md-7.brand-holder
- if brand_item - if brand_item
.brand-image .brand-image
= brand_image = brand_image
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment