Skip to content

Commit

Permalink
Style devise views
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  • Loading branch information
dzaporozhets committed Jan 1, 2014
1 parent 5b2aa85 commit a379bd0
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 60 deletions.
93 changes: 48 additions & 45 deletions app/assets/stylesheets/sections/login.scss
Original file line number Diff line number Diff line change
@@ -1,55 +1,58 @@
/* Login Page */
body.login-page{
.container > .content {
padding-top: 20px;
.login-page {
h1 {
font-size: 3em;
font-weight: 200;
}
}

.login-box{
width: 304px;
position: relative;
@include border-radius(5px);
margin: auto;
padding: 20px;
background: white;
}

.login-box .login-logo{
margin: 10px 0 30px 0;
display: block;
}

.login-box input.text{background-color: #f1f1f1; font-size: 16px; @include border-radius(0); padding: 14px 10px; width: 280px}

.login-box input.text.top{
@include border-radius(5px 5px 0 0);
margin-bottom: 0px;
}

.login-box input.text.bottom{
@include border-radius(0 0 5px 5px);
border-top: 0;
margin-bottom: 20px;
}

.login-box input.text.middle{
border-top: 0;
margin-bottom:0px;
}
.login-box{
width: 304px;
position: relative;
@include border-radius(5px);
margin: auto;
padding: 20px;
background: white;
}

.login-box a.forgot{float: right; padding-top: 6px}
.login-logo{
margin: 10px 0 30px 0;
display: block;
}

.remember_me {
text-align: left;
.form-control {
background-color: #f1f1f1;
font-size: 16px;
padding: 14px 10px;
width: 280px;
height: auto;

&.top {
@include border-radius(5px 5px 0 0);
margin-bottom: 0px;
}

&.bottom {
@include border-radius(0 0 5px 5px);
border-top: 0;
margin-bottom: 20px;
}

&.middle {
border-top: 0;
margin-bottom:0px;
@include border-radius(0);
}
}

input {
margin: 2px;
.login-box a.forgot {
float: right;
padding-top: 6px
}
}

.devise-errors {
h2 {
font-size: 14px;
color: #a00;
.devise-errors {
h2 {
font-size: 14px;
color: #a00;
}
}
}
3 changes: 2 additions & 1 deletion app/assets/stylesheets/sections/notes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Notes
*/

@-webkit-keyframes target-note {
@-webkit-keyframes targe3-note {
from { background:#fffff0; }
50% { background:#ffffd3; }
to { background:#fffff0; }
Expand Down Expand Up @@ -80,6 +80,7 @@ ul.notes {
overflow: hidden;
display: block;
position:relative;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
p { color: $style_color; }

.avatar {
Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/confirmations/new.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
.devise-errors
= devise_error_messages!
= f.email_field :email, placeholder: 'Email', class: "text", required: true
= f.email_field :email, placeholder: 'Email', class: "form-control", required: true
.clearfix.append-bottom-10
= f.submit "Resend confirmation instructions", class: 'btn btn-success'
%hr
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/passwords/edit.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
= devise_error_messages!
= f.hidden_field :reset_password_token
%div
= f.password_field :password, class: "text top", placeholder: "New password", required: true
= f.password_field :password, class: "form-control top", placeholder: "New password", required: true
%div
= f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm new password", required: true
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true
%div
.clearfix.append-bottom-10
= f.submit "Change my password", class: "btn btn-primary"
Expand Down
2 changes: 1 addition & 1 deletion app/views/devise/passwords/new.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%h3.page-title Reset password
.devise-errors
= devise_error_messages!
= f.email_field :email, placeholder: "Email", class: "text", required: true
= f.email_field :email, placeholder: "Email", class: "form-control", required: true
.clearfix.append-bottom-10
= f.submit "Reset password", class: "btn-primary btn"
%hr
Expand Down
10 changes: 5 additions & 5 deletions app/views/devise/registrations/new.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
.devise-errors
= devise_error_messages!
%div
= f.text_field :name, class: "text top", placeholder: "Name", required: true
= f.text_field :name, class: "form-control top", placeholder: "Name", required: true
%div
= f.text_field :username, class: "text middle", placeholder: "Username", required: true
= f.text_field :username, class: "form-control middle", placeholder: "Username", required: true
%div
= f.email_field :email, class: "text middle", placeholder: "Email", required: true
= f.email_field :email, class: "form-control middle", placeholder: "Email", required: true
%div
= f.password_field :password, class: "text middle", placeholder: "Password", required: true
= f.password_field :password, class: "form-control middle", placeholder: "Password", required: true
%div
= f.password_field :password_confirmation, class: "text bottom", placeholder: "Confirm password", required: true
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm password", required: true
%div
= f.submit "Sign up", class: "btn-create btn"
%hr
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/sessions/_new_base.html.haml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
= f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus"
= f.password_field :password, class: "text bottom", placeholder: "Password"
= f.text_field :login, class: "form-control top", placeholder: "Username or Email", autofocus: "autofocus"
= f.password_field :password, class: "form-control bottom", placeholder: "Password"
- if devise_mapping.rememberable?
.clearfix.append-bottom-10
%label.checkbox.remember_me{for: "user_remember_me"}
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/sessions/_new_ldap.html.haml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
= form_tag(user_omniauth_callback_path(:ldap), id: 'new_ldap_user' ) do
= text_field_tag :username, nil, {class: "text top", placeholder: "LDAP Login", autofocus: "autofocus"}
= password_field_tag :password, nil, {class: "text bottom", placeholder: "Password"}
= text_field_tag :username, nil, {class: "form-control top", placeholder: "LDAP Login", autofocus: "autofocus"}
= password_field_tag :password, nil, {class: "form-control bottom", placeholder: "Password"}
%br/
= submit_tag "LDAP Sign in", class: "btn-create btn"
2 changes: 1 addition & 1 deletion app/views/devise/sessions/new.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.login-box
%h3.page-title Sign in
- if ldap_enabled?
%ul.nav.nav-tabs
%ul.nav.nav-tabs.append-bottom-20
%li.active
= link_to 'LDAP', '#tab-ldap', 'data-toggle' => 'tab'
%li
Expand Down

0 comments on commit a379bd0

Please sign in to comment.