Commit 7fbc4f5b authored by Patricio Cano's avatar Patricio Cano

Corrected the layout of the strength indicator to be more consistent throughout the application.

 Fixed a test that was looking for an outdated HTML ID
parent 7039c986
...@@ -7,10 +7,11 @@ overwritten_rules = ...@@ -7,10 +7,11 @@ overwritten_rules =
$(document).ready -> $(document).ready ->
profileOptions = {} profileOptions = {}
profileOptions.ui = profileOptions.ui =
container: "#password-strength" showProgressBar: false
showVerdictsInsideProgressBar: true showVerdicts: false
showPopover: true showPopover: true
showErrors: true showErrors: true
showStatus: true
errorMessages: overwritten_messages errorMessages: overwritten_messages
profileOptions.rules = profileOptions.rules =
activated: overwritten_rules activated: overwritten_rules
...@@ -19,7 +20,6 @@ $(document).ready -> ...@@ -19,7 +20,6 @@ $(document).ready ->
deviseOptions.common = deviseOptions.common =
usernameField: "#user_username" usernameField: "#user_username"
deviseOptions.ui = deviseOptions.ui =
container: "#password-strength"
showPopover: true showPopover: true
showErrors: true showErrors: true
showVerdicts: false showVerdicts: false
......
...@@ -117,6 +117,14 @@ ...@@ -117,6 +117,14 @@
margin-bottom: 0; margin-bottom: 0;
} }
.progress { .has-success input {
margin-top: 10px; background-color: #C3FF88 !important;
}
.has-error input {
background-color: #FFA0A0 !important;
}
.has-warning input {
background-color: #FFEC8B !important;
} }
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.devise-errors .devise-errors
= devise_error_messages! = devise_error_messages!
= f.hidden_field :reset_password_token = f.hidden_field :reset_password_token
.form-group#password-strength .form-group
= f.password_field :password, class: "form-control top", id: "user_password_recover", placeholder: "New password", required: true = f.password_field :password, class: "form-control top", id: "user_password_recover", placeholder: "New password", required: true
%div %div
= f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.form-group .form-group
= f.label :current_password, class: 'control-label' = f.label :current_password, class: 'control-label'
.col-sm-10= f.password_field :current_password, required: true, class: 'form-control' .col-sm-10= f.password_field :current_password, required: true, class: 'form-control'
.form-group#password-strength .form-group
= f.label :password, class: 'control-label' = f.label :password, class: 'control-label'
.col-sm-10= f.password_field :password, required: true, class: 'form-control', id: 'user_password_profile' .col-sm-10= f.password_field :password, required: true, class: 'form-control', id: 'user_password_profile'
.form-group .form-group
......
...@@ -146,7 +146,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps ...@@ -146,7 +146,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps
step 'I submit new password' do step 'I submit new password' do
fill_in :user_current_password, with: '12345678' fill_in :user_current_password, with: '12345678'
fill_in :user_password, with: '12345678' fill_in :user_password_profile, with: '12345678'
fill_in :user_password_confirmation, with: '12345678' fill_in :user_password_confirmation, with: '12345678'
click_button "Set new password" click_button "Set new password"
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment