summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-19 16:46:19 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-02-19 16:46:19 -0800
commit00ac564423249c5be50e44d44ef822b4b686a931 (patch)
treea94d69c783ebcd0cac84d79b75829e6b1b8bd8b4 /app
parentc2623d2e203914840a5a9173b7e12aa77597d869 (diff)
downloadgitlab-ce-00ac564423249c5be50e44d44ef822b4b686a931.tar.gz
Improve sidebar active state
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/sections/nav_sidebar.scss7
-rw-r--r--app/views/layouts/nav/_project.html.haml2
2 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/stylesheets/sections/nav_sidebar.scss b/app/assets/stylesheets/sections/nav_sidebar.scss
index e9b97c5ea3e..de97be30b7d 100644
--- a/app/assets/stylesheets/sections/nav_sidebar.scss
+++ b/app/assets/stylesheets/sections/nav_sidebar.scss
@@ -40,9 +40,12 @@
.nav-sidebar li {
&.active a {
- color: #111;
- background: #EEE;
+ color: #333;
+ background: #FFF;
font-weight: bold;
+ border: 1px solid #EEE;
+ border-right: 1px solid transparent;
+ border-left: 3px solid $style_color;
&.no-highlight {
background: none;
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index caf319899f8..96d156e00d6 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -6,7 +6,7 @@
%span
Back to project
- = nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
+ = nav_link(html_options: {class: "separate-item"}) do
= link_to edit_project_path(@project), title: 'Settings', class: "stat-tab tab no-highlight" do
%i.fa.fa-cogs
%span