summaryrefslogtreecommitdiff
path: root/app/views/layouts/_page.html.haml
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-02 14:05:10 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-02 14:05:10 +0100
commit05224ae64ac769e3b9b06679d6e44fb120c879ef (patch)
treebaf7cf0144477dc8d81a384908824a96c3fae4ef /app/views/layouts/_page.html.haml
parent09e712c0fb721059e4b2619eb9fc104257fc492d (diff)
downloadgitlab-ce-05224ae64ac769e3b9b06679d6e44fb120c879ef.tar.gz
Restore sidebar tooltips and fix logo tooltip location
Diffstat (limited to 'app/views/layouts/_page.html.haml')
-rw-r--r--app/views/layouts/_page.html.haml10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 352b8040cf4..ec7cd79bc54 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,8 +1,8 @@
-.page-with-sidebar{ class: nav_sidebar_class }
+.page-with-sidebar{ class: page_sidebar_class }
= render "layouts/broadcast"
- .sidebar-wrapper.nicescroll
+ .sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
.header-logo
- = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do
+ = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home' do
= brand_header_logo
.gitlab-text-container
%h3 GitLab
@@ -17,8 +17,8 @@
.collapse-nav
= render partial: 'layouts/collapse_button'
- if current_user
- = link_to current_user, class: 'sidebar-user' do
- = image_tag avatar_icon(current_user, 60), alt: 'User activity', class: 'avatar avatar s36'
+ = link_to current_user, class: 'sidebar-user', title: "Profile" do
+ = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
.username
= current_user.username
.content-wrapper