Commit 61a3cd63 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Move logout buttom to top right corner

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 509fe115
...@@ -130,14 +130,6 @@ ...@@ -130,14 +130,6 @@
.username { .username {
display: none; display: none;
} }
.avatar {
margin-bottom: 10px;
}
.logout-holder {
text-align: center;
}
} }
} }
} }
...@@ -188,9 +180,8 @@ ...@@ -188,9 +180,8 @@
bottom: 0; bottom: 0;
width: 100%; width: 100%;
padding: 10px; padding: 10px;
color: #fff;
.avatar { .username {
margin-top: 5px; margin-top: 5px;
} }
} }
...@@ -30,8 +30,12 @@ ...@@ -30,8 +30,12 @@
border-right: 1px solid $color-darker; border-right: 1px solid $color-darker;
.sidebar-user { .sidebar-user {
a {
color: $color-light; color: $color-light;
&:hover {
background-color: $color-dark;
color: #FFF;
text-decoration: none;
} }
} }
} }
......
...@@ -8,14 +8,10 @@ ...@@ -8,14 +8,10 @@
.collapse-nav .collapse-nav
= render partial: 'layouts/collapse_button' = render partial: 'layouts/collapse_button'
- if current_user - if current_user
.sidebar-user = link_to current_user, class: 'sidebar-user' do
= 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' = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s32'
.username .username
= current_user.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 .content-wrapper
.container-fluid .container-fluid
.content .content
......
...@@ -39,5 +39,8 @@ ...@@ -39,5 +39,8 @@
%li %li
= link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
= icon('cog fw') = 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' = render 'shared/outdated_browser'
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