From 08a12f24b00a0d3c3b42ff80baaebba1f26a33a6 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 28 May 2015 20:36:47 +0200
Subject: Make user settings account page nicer

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/pages/profile.scss  |  5 +++--
 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
-- 
cgit v1.2.1