Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

adapt reset password page to new styles #419

Merged
merged 2 commits into from
Oct 18, 2018
Merged

adapt reset password page to new styles #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a69128
adapt reset password page to new styles; upgrade devise; remove unuse…
markets Sep 5, 2018
a9c7740
Merge branch 'develop' into reset_pass_styles
enricostano Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gem 'pundit', '~> 2.0.0'
gem 'pg', '0.17.1'
gem 'hstore_translate'
gem 'dalli'
gem 'devise', '~> 4.4.1'
gem 'devise', '~> 4.5.0'
gem "http_accept_language", '~> 2.1.1'
gem 'unicorn'
gem 'kaminari', '~> 1.1.1'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ GEM
dalli (2.7.2)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
devise (4.4.3)
devise (4.5.0)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 6.0)
Expand Down Expand Up @@ -412,7 +412,7 @@ DEPENDENCIES
coffee-rails
dalli
database_cleaner (= 1.6.2)
devise (~> 4.4.1)
devise (~> 4.5.0)
dotenv-rails (= 2.5.0)
elasticsearch-model
elasticsearch-rails
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ label[required]::after{
}

.panel-body h2 {
font-size: 1.9rem;
font-size: 2.24rem;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ℹ️

timeoverflow/app/assets/stylesheets/application.css.scss

Line 132 in dbf1a65

font-size: 2.24rem;

font-weight: 500;
margin: 0;
padding: 0;
Expand Down
34 changes: 16 additions & 18 deletions app/views/devise/passwords/edit.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,30 @@
<div class="row">
<div class="col-sm-4">
<%= render "devise/shared/links" %>
</div>
<div class="col-sm-8">
<div class="panel panel-primary">
<div class="panel-heading">
<h2 class="panel-title">
<%= t(".change_password") %>
</h2>
</div>
<div class="col-sm-6 col-sm-offset-3">
<div class="panel panel-primary" id="login-box">
<div class="panel-body">
<h2><%= t(".change_password") %></h2>
<%= render 'layouts/messages' %>
<%= show_error_messages!(resource) %>
<%= form_for resource, url: password_path(resource_name), html: { method: :put } do |f| %>
<%= f.hidden_field :reset_password_token %>
<div class="form-group">
<%= f.label :password, t(".new_password"), class: "control-label" %>
<%= f.password_field :password, required: true, autofocus: true, class: "form-control", ng_model: "password" %>
<div class="input-group">
<span class="input-group-addon">
<i class="material-icons">lock</i>
</span>
<%= f.password_field :password, required: true, autofocus: true, placeholder: t(".new_password"), class: "form-control input-lg" %>
</div>
</div>
<div class="form-group" ng_class="{ 'has-error': password != password_confirmation %>">
<%= f.label :password_confirmation, t(".confirm_password"), class: "control-label" %>
<%= f.password_field :password_confirmation, required: true, class: "form-control", ng_model: "password_confirmation" %>
<div class="help-block" ng_if="password && password_confirmation && password != password_confirmation">
<%= t ".passwords_not_match" %>
<div class="form-group">
<div class="input-group">
<span class="input-group-addon">
<i class="material-icons">lock</i>
</span>
<%= f.password_field :password_confirmation, required: true, placeholder: t(".confirm_password"), oninput: "this.setCustomValidity(this.value != form.user_password.value ? '#{t(".passwords_not_match")}' : '')", class: "form-control input-lg" %>
</div>
</div>
<div class="form-group">
<%= f.submit t(".change_password"), class: "btn btn-primary", ng_disabled: "!password || password != password_confirmation" %>
<%= f.submit t(".change_password"), class: "btn btn-primary btn-lg col-xs-12" %>
</div>
<% end %>
</div>
Expand Down
61 changes: 0 additions & 61 deletions app/views/devise/registrations/edit.html.erb
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions app/views/devise/registrations/new.html.erb
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/statistics/statistics_global_activity.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%= t 'global.statistics' %>: <%= t '.global_activity' %>
</h1>
<div>
<div class="panel panel-default" ng_controller="">
<div class="panel panel-default">
<div class="panel-body">
<ul class="nav nav-pills statistics">
<li>
Expand Down