Commit b16592b0172152722c90ba4fdadfcd9600eb65ef
1 parent
c21c6993
Exists in
colab
and in
4 other branches
Restored remaining styles removed after Devise internationalization
Showing
5 changed files
with
14 additions
and
12 deletions
Show diff stats
app/views/devise/confirmations/new.html.erb
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | <div><%= f.label :email %><br /> |
| 7 | 7 | <%= f.email_field :email %></div> |
| 8 | 8 | |
| 9 | - <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></div> | |
| 9 | + <div><%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions'), class: 'btn btn-default' %></div> | |
| 10 | 10 | <% end %> |
| 11 | 11 | |
| 12 | 12 | <%= render "devise/shared/links" %> | ... | ... |
app/views/devise/registrations/edit.html.erb
| 1 | 1 | <div class="page-header"> |
| 2 | 2 | <h1><%= t('.title', :resource => resource_class.model_name.human , :default => "Edit #{resource_name.to_s.humanize}") %></h1> |
| 3 | 3 | |
| 4 | -<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> | |
| 4 | +<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form-inline" }) do |f| %> | |
| 5 | 5 | <%= devise_error_messages! %> |
| 6 | 6 | |
| 7 | 7 | <div class="row margin-left-none"> |
| ... | ... | @@ -79,6 +79,6 @@ |
| 79 | 79 | |
| 80 | 80 | <h2><%= t('.cancel_my_account', :default => 'Cancel my account') %></h2> |
| 81 | 81 | |
| 82 | -<p><%= t('.unhappy', :default => 'Unhappy') %>? <%= link_to t('.cancel_my_account', :default => "Cancel my account"), registration_path(resource_name), :data => { :confirm => t('.are_you_sure', :default => "Are you sure?") }, :method => :delete %>.</p> | |
| 82 | +<p><%= t('.unhappy', :default => 'Unhappy') %>? <%= link_to t('.cancel_my_account', :default => "Cancel my account"), registration_path(resource_name), :data => { :confirm => t('.are_you_sure', :default => "Are you sure?") }, :method => :delete, class: 'btn btn-warning' %>.</p> | |
| 83 | 83 | |
| 84 | -<%= link_to t('devise.shared.links.back', :default => "Back"), :back %> | |
| 84 | +<%= link_to t('devise.shared.links.back', :default => "Back"), :back, class: 'btn btn-default' %> | ... | ... |
app/views/devise/registrations/new.html.erb
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | <h1><%= t('.sign_up', :default => "Sign up") %></h1> |
| 3 | 3 | </div> |
| 4 | 4 | |
| 5 | -<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> | |
| 5 | +<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class => "form-inline" }) do |f| %> | |
| 6 | 6 | <%= devise_error_messages! %> |
| 7 | 7 | |
| 8 | 8 | <div class="row margin-left-none"> | ... | ... |
app/views/devise/sessions/new.html.erb
| ... | ... | @@ -2,13 +2,13 @@ |
| 2 | 2 | <h1><%= t('.sign_in', :default => "Sign in") %></h1> |
| 3 | 3 | </div> |
| 4 | 4 | |
| 5 | -<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> | |
| 5 | +<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "form-inline" }) do |f| %> | |
| 6 | 6 | <div class="row margin-left-none"> |
| 7 | 7 | <div class="form-table col-md-9"> |
| 8 | 8 | <div class="form-row"> |
| 9 | 9 | <div class="field-container"> |
| 10 | - <%= f.label :email %><br /> | |
| 11 | - <%= f.email_field :email %> | |
| 10 | + <%= f.label :email, class: 'control-label' %><br /> | |
| 11 | + <%= f.email_field :email, :autofocus => true, class: 'text-field form-control' %> | |
| 12 | 12 | </div> |
| 13 | 13 | <div class="help-container"> |
| 14 | 14 | <p> |
| ... | ... | @@ -19,8 +19,8 @@ |
| 19 | 19 | |
| 20 | 20 | <div class="form-row"> |
| 21 | 21 | <div class="field-container"> |
| 22 | - <%= f.label :password %><br /> | |
| 23 | - <%= f.password_field :password %> | |
| 22 | + <%= f.label :password, class: 'control-label' %><br /> | |
| 23 | + <%= f.password_field :password, class: 'text-field form-control' %> | |
| 24 | 24 | </div> |
| 25 | 25 | <div class="help-container"> |
| 26 | 26 | <p> |
| ... | ... | @@ -32,7 +32,9 @@ |
| 32 | 32 | <% if devise_mapping.rememberable? -%> |
| 33 | 33 | <div class="form-row"> |
| 34 | 34 | <div class="field-container"> |
| 35 | - <%= f.check_box :remember_me %> <%= f.label :remember_me %> | |
| 35 | + <label> | |
| 36 | + <%= f.check_box :remember_me %> <%= f.label :remember_me %> | |
| 37 | + </label> | |
| 36 | 38 | </div> |
| 37 | 39 | <div class="help-container"> |
| 38 | 40 | <p> | ... | ... |
app/views/devise/unlocks/new.html.erb
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | <div><%= f.label :email %><br /> |
| 7 | 7 | <%= f.email_field :email %></div> |
| 8 | 8 | |
| 9 | - <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></div> | |
| 9 | + <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions"), class: 'btn btn-primary' %></div> | |
| 10 | 10 | <% end %> |
| 11 | 11 | |
| 12 | 12 | <%= render "devise/shared/links" %> | ... | ... |