Merge branch 'sidebar-overlap-fix' into 'master'

Fix issue with overlap of sidebar links. Thanks @iamphill for the help with this one. ![Screen_Shot_2016-03-01_at_10.19.52_AM](/uploads/f203fde79ae397ad18f23c4108f1c306/Screen_Shot_2016-03-01_at_10.19.52_AM.png) cc @iamphill @alfredo1 @dzaporozhets @rymai See merge request !3043

Merge branch 'sidebar-overlap-fix' into 'master'
352ea5d6 · Dmitriy Zaporozhets · 3d1de5ba · 1bdc274f · 352ea5d6 · 352ea5d6
Commit 352ea5d6 authored Mar 01, 2016 by Dmitriy Zaporozhets
Showing with 3 additions and 3 deletions

sidebar.scss app/assets/stylesheets/framework/sidebar.scss +1 -1

_page.html.haml app/views/layouts/_page.html.haml +1 -1

_page.html.haml app/views/layouts/ci/_page.html.haml +1 -1

No files found.
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -13,7 +13,7 @@
    transition-duration: .3s;
  }

-  .home {
+  .gitlab-text-container-link {
    z-index: 1;
    position: absolute;
    left: 0px;

--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -4,7 +4,7 @@
    .header-logo
      %a#logo
        = brand_header_logo
-      = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home' do
+      = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do
        .gitlab-text-container
          %h3 GitLab


--- a/app/views/layouts/ci/_page.html.haml
+++ b/app/views/layouts/ci/_page.html.haml
@@ -4,7 +4,7 @@
    .header-logo
      %a#logo
        = brand_header_logo
-      = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home' do
+      = link_to root_path, class: 'gitlab-text-container-link', title: 'Dashboard', id: 'js-shortcuts-home' do
        .gitlab-text-container
          %h3 GitLab