Move logout buttom to top right corner

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

4 files changed, 12 insertions, 18 deletions

diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index 0cbb996f4e8..65e06e14c73 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -130,14 +130,6 @@
       .username {
         display: none;
       }
-
-      .avatar {
-        margin-bottom: 10px;
-      }
-
-      .logout-holder {
-        text-align: center;
-      }
     }
   }
 }
@@ -188,9 +180,8 @@
   bottom: 0;
   width: 100%;
   padding: 10px;
-  color: #fff;
 
-  .avatar {
+  .username {
     margin-top: 5px;
   }
 }
diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss
index 1b06b4aa925..10fcaf18fa9 100644
--- a/app/assets/stylesheets/themes/gitlab-theme.scss
+++ b/app/assets/stylesheets/themes/gitlab-theme.scss
@@ -30,8 +30,12 @@
       border-right: 1px solid $color-darker;
 
       .sidebar-user {
-        a {
-          color: $color-light;
+        color: $color-light;
+
+        &:hover {
+          background-color: $color-dark;
+          color: #FFF;
+          text-decoration: none;
         }
       }
     }
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 54fcbca6bc6..f17f6fdd91c 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -8,14 +8,10 @@
     .collapse-nav
       = render partial: 'layouts/collapse_button'
     - if current_user
-      .sidebar-user
-        = link_to current_user, class: 'profile-pic', id: 'profile-pic', data: {toggle: 'tooltip', placement: 'top'} do
-          = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s32'
+      = link_to current_user, class: 'sidebar-user' do
+        = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s32'
         .username
           = current_user.username
-        .logout-holder
-          = link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'top'} do
-            = icon('sign-out')
   .content-wrapper
     .container-fluid
       .content
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 2970af377f5..f1508a27f27 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -39,5 +39,8 @@
           %li
             = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('cog fw')
+          %li
+            = link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom'} do
+              = icon('sign-out')
 
 = render 'shared/outdated_browser'