-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #62 from hisea/bootstrap4
Bootstrap 4
- Loading branch information
Showing
21 changed files
with
206 additions
and
245 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,11 @@ | ||
| /.bundle/ | ||
| /.yardoc | ||
| /Gemfile.lock | ||
| /_yardoc/ | ||
| /coverage/ | ||
| /doc/ | ||
| /pkg/ | ||
| /spec/reports/ | ||
| /tmp/ | ||
|
|
||
| *.gem | ||
| *.rbc | ||
| .bundle | ||
| .config | ||
| .yardoc | ||
| Gemfile.lock | ||
| InstalledFiles | ||
| _yardoc | ||
| coverage | ||
| doc/ | ||
| lib/bundler/man | ||
| pkg | ||
| rdoc | ||
| spec/reports | ||
| test/tmp | ||
| test/version_tmp | ||
| tmp | ||
| *.bundle | ||
| *.so | ||
| *.o | ||
| *.a | ||
| mkmf.log |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| require "bundler/gem_tasks" | ||
|
|
||
| require 'bundler/gem_tasks' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +0,0 @@ | ||
| .float-none { | ||
| float: none; | ||
| } | ||
|
|
||
| .panel-heading { | ||
| padding: 15px; | ||
| h4 { | ||
| margin: 0px; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +0,0 @@ | ||
| .float-none { | ||
| float: none; | ||
| } | ||
|
|
||
| .panel-heading { | ||
| padding: 15px; | ||
| h4 { | ||
| margin: 0px; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,16 @@ | ||
| <%= bootstrap_devise_error_messages! %> | ||
| <div class="panel panel-default devise-bs"> | ||
| <div class="panel-heading"> | ||
| <h4><%= t('.resend_confirmation_instructions', default: 'Resend confirmation instructions') %></h4> | ||
|
|
||
| <h1><%= t('.resend_confirmation_instructions', default: 'Resend confirmation instructions') %></h1> | ||
|
|
||
| <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, role: 'form' }) do |f| %> | ||
| <div class="form-group"> | ||
| <%= f.label :email %> | ||
| <%= f.email_field :email, autofocus: true, class: "form-control" %> | ||
| </div> | ||
| <div class="panel-body"> | ||
| <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, role: 'form' }) do |f| %> | ||
| <div class="form-group"> | ||
| <%= f.label :email %> | ||
| <%= f.email_field :email, autofocus: true, class: "form-control" %> | ||
| </div> | ||
|
|
||
| <%= f.submit t('.resend_confirmation_instructions', default: 'Resend confirmation instructions'), class: 'btn btn-primary' %> | ||
| <% end %> | ||
| <div class="form-group"> | ||
| <%= f.submit t('.resend_confirmation_instructions', default: 'Resend confirmation instructions'), class: 'btn btn-primary' %> | ||
| </div> | ||
| </div> | ||
| <% end %> | ||
|
|
||
| <%= render 'devise/shared/links' %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,23 @@ | ||
| <%= bootstrap_devise_error_messages! %> | ||
| <div class="panel panel-default devise-bs"> | ||
| <div class="panel-heading"> | ||
| <h4><%= t('.change_your_password', default: 'Change your password') %></h4> | ||
| </div> | ||
| <div class="panel-body"> | ||
| <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, role: 'form' }) do |f| %> | ||
| <%= f.hidden_field :reset_password_token %> | ||
|
|
||
| <div class="form-group"> | ||
| <%= f.label :password, t('.new_password', default: 'New password') %> | ||
| <%= f.password_field :password, autofocus: true, class: 'form-control' %> | ||
| </div> | ||
| <h1><%= t('.change_your_password', default: 'Change your password') %></h1> | ||
|
|
||
| <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, role: 'form' }) do |f| %> | ||
| <%= f.hidden_field :reset_password_token %> | ||
|
|
||
| <div class="form-group"> | ||
| <%= f.label :password, t('.new_password', default: 'New password') %> | ||
| <%= f.password_field :password, autofocus: true, class: 'form-control' %> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <%= f.label :password_confirmation, t('.confirm_new_password', default: 'Confirm new password') %> | ||
| <%= f.password_field :password_confirmation, class: 'form-control' %> | ||
| </div> | ||
| <div class="form-group"> | ||
| <%= f.label :password_confirmation, t('.confirm_new_password', default: 'Confirm new password') %> | ||
| <%= f.password_field :password_confirmation, class: 'form-control' %> | ||
| </div> | ||
|
|
||
| <%= f.submit t('.change_my_password', default: 'Change my password'), class: 'btn btn-primary' %> | ||
| <% end %> | ||
| <div class="form-group"> | ||
| <%= f.submit t('.change_my_password', default: 'Change my password'), class: 'btn btn-primary' %> | ||
| </div> | ||
| </div> | ||
| <% end %> | ||
|
|
||
| <%= render 'devise/shared/links' %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,16 @@ | ||
| <%= bootstrap_devise_error_messages! %> | ||
| <div class="panel panel-default devise-bs"> | ||
| <div class="panel-heading"> | ||
| <h4><%= t('.forgot_your_password', default: 'Forgot your password?') %></h4> | ||
|
|
||
| <h1><%= t('.forgot_your_password', default: 'Forgot your password?') %></h1> | ||
|
|
||
| <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, role: 'form' }) do |f| %> | ||
| <div class="form-group"> | ||
| <%= f.label :email %> | ||
| <%= f.email_field :email, autofocus: true, class: 'form-control' %> | ||
| </div> | ||
| <div class="panel-body"> | ||
| <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, role: "form" }) do |f| %> | ||
| <div class="form-group"> | ||
| <%= f.label :email %> | ||
| <%= f.email_field :email, autofocus: true, class: 'form-control' %> | ||
| </div> | ||
|
|
||
| <%= f.submit t('.send_me_reset_password_instructions', default: 'Send me reset password instructions'), class: 'btn btn-primary' %> | ||
| <% end %> | ||
| <div class="form-group"> | ||
| <%= f.submit t('.send_me_reset_password_instructions', default: 'Send me reset password instructions'), class: 'btn btn-primary' %> | ||
| </div> | ||
| </div> | ||
| <% end %> | ||
|
|
||
| <%= render 'devise/shared/links' %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| <%= bootstrap_devise_error_messages! %> | ||
| <div class="panel panel-default devise-bs"> | ||
| <div class="panel-heading"> | ||
| <h4><%= t('.sign_up', default: 'Sign up') %></h4> | ||
|
|
||
| <h1><%= t('.sign_up', default: 'Sign up') %></h1> | ||
|
|
||
| <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { role: 'form' }) do |f| %> | ||
| <div class="form-group"> | ||
| <%= f.label :email %> | ||
| <%= f.email_field :email, autofocus: true, class: 'form-control' %> | ||
| </div> | ||
| <div class="panel-body"> | ||
| <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { role: 'form' }) do |f| %> | ||
| <div class="form-group"> | ||
| <%= f.label :email %> | ||
| <%= f.email_field :email, autofocus: true, class: 'form-control' %> | ||
| </div> | ||
| <div class="form-group"> | ||
| <%= f.label :password %> | ||
| <%= f.password_field :password, class: 'form-control' %> | ||
| </div> | ||
| <div class="form-group"> | ||
| <%= f.label :password_confirmation %> | ||
| <%= f.password_field :password_confirmation, class: 'form-control' %> | ||
| </div> | ||
| <%= f.submit t('.sign_up', default: 'Sign up'), class: 'btn btn-primary' %> | ||
| <% end %> | ||
| <div class="form-group"> | ||
| <%= f.label :password %> | ||
| <%= f.password_field :password, class: 'form-control' %> | ||
| </div> | ||
| </div> | ||
| <div class="form-group"> | ||
| <%= f.label :password_confirmation %> | ||
| <%= f.password_field :password_confirmation, class: 'form-control' %> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <%= f.submit t('.sign_up', default: 'Sign up'), class: 'btn btn-primary' %> | ||
| </div> | ||
| <% end %> | ||
|
|
||
| <%= render 'devise/shared/links' %> |
Oops, something went wrong.