diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-15 17:52:20 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-08-15 17:52:20 +0300 |
commit | d28a27f7c434b03b8e715af8be628a86f44188a3 (patch) | |
tree | c202440b87217b14ee3ab3ddf41c12e94a12b72a | |
parent | cb33279a0f36f2c6a70d5ecf00bbd8749b92c51b (diff) | |
download | gitlab-ce-d28a27f7c434b03b8e715af8be628a86f44188a3.tar.gz |
Cleaner UI for login/signup pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | app/assets/stylesheets/sections/login.scss | 21 | ||||
-rwxr-xr-x | app/views/devise/confirmations/new.html.haml | 10 | ||||
-rw-r--r-- | app/views/devise/passwords/edit.html.haml | 10 | ||||
-rwxr-xr-x | app/views/devise/passwords/new.html.haml | 10 | ||||
-rw-r--r-- | app/views/devise/registrations/new.html.haml | 10 | ||||
-rw-r--r-- | app/views/devise/sessions/_new_base.html.haml | 6 | ||||
-rw-r--r-- | app/views/devise/sessions/_oauth_providers.html.haml | 3 | ||||
-rw-r--r-- | app/views/devise/sessions/new.html.haml | 10 | ||||
-rw-r--r-- | app/views/layouts/devise.html.haml | 2 |
9 files changed, 50 insertions, 32 deletions
diff --git a/app/assets/stylesheets/sections/login.scss b/app/assets/stylesheets/sections/login.scss index 77ebef690c3..1bcb1f6d68e 100644 --- a/app/assets/stylesheets/sections/login.scss +++ b/app/assets/stylesheets/sections/login.scss @@ -6,6 +6,21 @@ } .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 { @@ -19,7 +34,7 @@ } } - .login-logo{ + .login-logo { margin: 10px 0 30px 0; display: block; } @@ -64,4 +79,8 @@ color: #a00; } } + + .brand-holder { + border-right: 1px solid #EEE; + } } diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml index 08e17490865..8d17f39eba2 100755 --- a/app/views/devise/confirmations/new.html.haml +++ b/app/views/devise/confirmations/new.html.haml @@ -1,7 +1,7 @@ -.login-box.panel.panel-default - .panel-heading - %h3.panel-title Resend confirmation instructions - .panel-body +.login-box + .login-heading + %h3 Resend confirmation instructions + .login-body = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| .devise-errors = devise_error_messages! @@ -9,5 +9,5 @@ = f.email_field :email, placeholder: 'Email', class: "form-control", required: true .clearfix.append-bottom-10 = f.submit "Resend confirmation instructions", class: 'btn btn-success' - .panel-footer + .login-footer = render 'devise/shared/sign_in_link' diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml index efcd0296176..1326cc0aac9 100644 --- a/app/views/devise/passwords/edit.html.haml +++ b/app/views/devise/passwords/edit.html.haml @@ -1,7 +1,7 @@ -.login-box.panel.panel-default - .panel-heading - %h3.panel-title Change your password - .panel-body +.login-box + .login-heading + %h3 Change your password + .login-body = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| .devise-errors = devise_error_messages! @@ -12,7 +12,7 @@ = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true .clearfix.append-bottom-10 = f.submit "Change my password", class: "btn btn-primary" - .panel-footer + .login-footer %p = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) = render 'devise/shared/sign_in_link' diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index bf44dee5ad7..b8af1b8693a 100755 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -1,7 +1,7 @@ -.login-box.panel.panel-default - .panel-heading - %h3.panel-title Reset password - .panel-body +.login-box + .login-heading + %h3 Reset password + .login-body = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| .devise-errors = devise_error_messages! @@ -9,5 +9,5 @@ = f.email_field :email, placeholder: "Email", class: "form-control", required: true .clearfix.append-bottom-10 = f.submit "Reset password", class: "btn-primary btn" - .panel-footer + .login-footer = render 'devise/shared/sign_in_link' diff --git a/app/views/devise/registrations/new.html.haml b/app/views/devise/registrations/new.html.haml index 52d484949b6..d6a952f3dc5 100644 --- a/app/views/devise/registrations/new.html.haml +++ b/app/views/devise/registrations/new.html.haml @@ -1,7 +1,7 @@ -.login-box.panel.panel-success - .panel-heading - %h3.panel-title Sign up - .panel-body +.login-box + .login-heading + %h3 Sign up + .login-body = form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| .devise-errors = devise_error_messages! @@ -17,7 +17,7 @@ = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm password", required: true %div = f.submit "Sign up", class: "btn-create btn" - .panel-footer + .login-footer %p %span.light Have an account? diff --git a/app/views/devise/sessions/_new_base.html.haml b/app/views/devise/sessions/_new_base.html.haml index 4e196044892..e819847e5ea 100644 --- a/app/views/devise/sessions/_new_base.html.haml +++ b/app/views/devise/sessions/_new_base.html.haml @@ -6,7 +6,7 @@ %label.checkbox.remember_me{for: "user_remember_me"} = f.check_box :remember_me %span Remember me + .pull-right + = link_to "Forgot your password?", new_password_path(resource_name) %div - = f.submit "Sign in", class: "btn-save btn" - .pull-right - = link_to "Forgot your password?", new_password_path(resource_name), class: "btn" + = f.submit "Sign in", class: "btn btn-save" diff --git a/app/views/devise/sessions/_oauth_providers.html.haml b/app/views/devise/sessions/_oauth_providers.html.haml index 935bc6af505..a917484a231 100644 --- a/app/views/devise/sessions/_oauth_providers.html.haml +++ b/app/views/devise/sessions/_oauth_providers.html.haml @@ -1,7 +1,6 @@ - providers = (enabled_oauth_providers - [:ldap]) - if providers.present? - %hr - %div{:'data-no-turbolink' => 'data-no-turbolink'} + %div.light-well{:'data-no-turbolink' => 'data-no-turbolink'} %span Sign in with: - providers.each do |provider| %span diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index f53d6f09daf..b70b0d66172 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -1,7 +1,7 @@ -.login-box.panel.panel-primary - .panel-heading - %h3.panel-title Sign in - .panel-body +.login-box + .login-heading + %h3 Sign in + .login-body - if ldap_enabled? && gitlab_config.signin_enabled %ul.nav.nav-tabs %li.active @@ -24,7 +24,7 @@ = render 'devise/sessions/oauth_providers' if Gitlab.config.omniauth.enabled && devise_mapping.omniauthable? - .panel-footer + .login-footer - if gitlab_config.signup_enabled %p %span.light diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index dd70836cdc9..ffa48a68b42 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -11,7 +11,7 @@ .container .content .row - .col-md-7 + .col-md-7.brand-holder - if brand_item .brand-image = brand_image |