Commit 51888f74 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents d0d596ae 08a12f24
...@@ -84,8 +84,9 @@ ...@@ -84,8 +84,9 @@
} }
.btn { .btn {
line-height: 36px; line-height: 40px;
height: 56px; height: 42px;
padding: 0px 12px;
img { img {
width: 32px; width: 32px;
......
...@@ -26,20 +26,23 @@ ...@@ -26,20 +26,23 @@
- if current_user.private_token - if current_user.private_token
= text_field_tag "token", current_user.private_token, class: "form-control" = text_field_tag "token", current_user.private_token, class: "form-control"
%div %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 - else
%span You don`t have one yet. Click generate to fix it. %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? - unless current_user.ldap_user?
- if current_user.otp_required_for_login .panel.panel-default
.panel.panel-success
.panel-heading .panel-heading
Two-factor Authentication enabled Two-factor Authentication
.panel-body .panel-body
- if current_user.otp_required_for_login
.pull-right .pull-right
= link_to 'Disable Two-factor Authentication', profile_two_factor_auth_path, method: :delete, class: 'btn btn-close btn-sm', = link_to 'Disable Two-factor Authentication', profile_two_factor_auth_path, method: :delete, class: 'btn btn-close btn-sm',
data: { confirm: 'Are you sure?' } data: { confirm: 'Are you sure?' }
%p.text-success
%strong
Two-factor Authentication is enabled
%p %p
If you lose your recovery codes you can If you lose your recovery codes you can
%strong %strong
...@@ -48,10 +51,6 @@ ...@@ -48,10 +51,6 @@
invalidating all previous codes. invalidating all previous codes.
- else - else
.panel.panel-default
.panel-heading
Two-factor Authentication
.panel-body
%p %p
Increase your account's security by enabling two-factor authentication (2FA). Increase your account's security by enabling two-factor authentication (2FA).
%p %p
......
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