diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-28 19:52:26 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-28 19:52:26 +0000 |
commit | 51888f746c8afe43c5fed90c8013a03788821099 (patch) | |
tree | 08b28126e0af8bcf0cbc28fb9e6e54f08f47ae2d | |
parent | d0d596ae4a7efd3c35031f485954896a3702f8d1 (diff) | |
parent | 08a12f24b00a0d3c3b42ff80baaebba1f26a33a6 (diff) | |
download | gitlab-ce-51888f746c8afe43c5fed90c8013a03788821099.tar.gz |
Merge branch 'nicer-acccount-page' into 'master'
Make user settings account page nicer
* make 2 factor auth section `panel-default`
* make oauth buttons smaller
* remove primary button from reset token form
![Screenshot_2015-05-28_20.37.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e536723e087b72a5c08b29072fb4972f/Screenshot_2015-05-28_20.37.30.png)
See merge request !733
-rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 5 | ||||
-rw-r--r-- | app/views/profiles/accounts/show.html.haml | 23 |
2 files changed, 14 insertions, 14 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 5b528b38d36..5a5fbc468a3 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -84,8 +84,9 @@ } .btn { - line-height: 36px; - height: 56px; + line-height: 40px; + height: 42px; + padding: 0px 12px; img { width: 32px; diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index c30a3f5d79a..a26d4e0c757 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -26,20 +26,23 @@ - if current_user.private_token = text_field_tag "token", current_user.private_token, class: "form-control" %div - = f.submit 'Reset private token', data: { confirm: "Are you sure?" }, class: "btn btn-primary btn-build-token" + = f.submit 'Reset private token', data: { confirm: "Are you sure?" }, class: "btn btn-default btn-build-token" - else %span You don`t have one yet. Click generate to fix it. - = f.submit 'Generate', class: "btn success btn-build-token" + = f.submit 'Generate', class: "btn btn-default btn-build-token" - unless current_user.ldap_user? - - if current_user.otp_required_for_login - .panel.panel-success - .panel-heading - Two-factor Authentication enabled - .panel-body + .panel.panel-default + .panel-heading + Two-factor Authentication + .panel-body + - if current_user.otp_required_for_login .pull-right = link_to 'Disable Two-factor Authentication', profile_two_factor_auth_path, method: :delete, class: 'btn btn-close btn-sm', data: { confirm: 'Are you sure?' } + %p.text-success + %strong + Two-factor Authentication is enabled %p If you lose your recovery codes you can %strong @@ -47,11 +50,7 @@ = link_to 'generate new ones', codes_profile_two_factor_auth_path, method: :post, data: { confirm: 'Are you sure?' } invalidating all previous codes. - - else - .panel.panel-default - .panel-heading - Two-factor Authentication - .panel-body + - else %p Increase your account's security by enabling two-factor authentication (2FA). %p |