diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-01 16:10:22 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-01 16:10:22 +0000 |
| commit | 352ea5d6d02141bf42c7d3d1d1140da54ed520fd (patch) | |
| tree | d15c25130e18b60a3cf8dc521fb9e1483f557a38 | |
| parent | 3d1de5ba35215e7aa3b4fb5ea3d454e082d667e0 (diff) | |
| parent | 1bdc274f64f3cb7503c16caeb5959f88c63fe604 (diff) | |
| download | gitlab-ce-352ea5d6d02141bf42c7d3d1d1140da54ed520fd.tar.gz | |
Merge branch 'sidebar-overlap-fix' into 'master'
Fix issue with overlap of sidebar links.
Thanks @iamphill for the help with this one.
cc @iamphill @alfredo1 @dzaporozhets @rymai
See merge request !3043
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 2 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/ci/_page.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 0596924a8f6..de947c89c19 100644 --- 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; diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index e53d5b07801..c799e9c588d 100644 --- 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 diff --git a/app/views/layouts/ci/_page.html.haml b/app/views/layouts/ci/_page.html.haml index 3cfd36720f0..a13241bebee 100644 --- 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 |