diff options
author | Patricio Cano <patricio@gitlab.com> | 2014-10-23 17:49:48 -0500 |
---|---|---|
committer | Patricio Cano <patricio@gitlab.com> | 2014-10-23 17:49:48 -0500 |
commit | 7fbc4f5b3ac2abfa8ad94cc228114462b7b94601 (patch) | |
tree | ececd9ce78e7f4470824322e0dc94c0aae6dd1e7 /app/views | |
parent | 7039c9868a3209d89f8306c65ca5b74f8e2ea2c0 (diff) | |
download | gitlab-ce-7fbc4f5b3ac2abfa8ad94cc228114462b7b94601.tar.gz |
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
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/devise/passwords/edit.html.haml | 2 | ||||
-rw-r--r-- | app/views/profiles/passwords/new.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml index f6cbf9b82ba..182ca5e774b 100644 --- a/app/views/devise/passwords/edit.html.haml +++ b/app/views/devise/passwords/edit.html.haml @@ -6,7 +6,7 @@ .devise-errors = devise_error_messages! = 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 %div = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml index 746b3a721e1..42d2d0db29c 100644 --- a/app/views/profiles/passwords/new.html.haml +++ b/app/views/profiles/passwords/new.html.haml @@ -14,7 +14,7 @@ .form-group = f.label :current_password, class: 'control-label' .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' .col-sm-10= f.password_field :password, required: true, class: 'form-control', id: 'user_password_profile' .form-group |