diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-16 14:27:06 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-21 16:45:23 +0300 |
| commit | 1dafd67010c2e400e25daac7d3ab650826413ef6 (patch) | |
| tree | 7f3c2ea89b43b3628ad0a73c1abb29d1203526ed | |
| parent | 4c01a68fc70cca14868e166361188601dc505d9f (diff) | |
fixed dashboard projects nav item being active
it is now only shown as active when on the dashbord/projects controller
[ci skip]
| -rw-r--r-- | app/assets/stylesheets/new_nav.scss | 7 | ||||
| -rw-r--r-- | app/views/layouts/nav/_new_dashboard.html.haml | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/stylesheets/new_nav.scss b/app/assets/stylesheets/new_nav.scss index ae4f78e3053..aa96450ca1e 100644 --- a/app/assets/stylesheets/new_nav.scss +++ b/app/assets/stylesheets/new_nav.scss @@ -131,11 +131,14 @@ header.navbar-gitlab-new { background-color: $gl-gray-light; } - .search-input, - .search-input::placeholder { + .search-input { color: $gray-normal; } + .search-input::placeholder { + color: $gray-dark; + } + .location-badge { color: $gray-normal; background-color: #2d2d2d; diff --git a/app/views/layouts/nav/_new_dashboard.html.haml b/app/views/layouts/nav/_new_dashboard.html.haml index 35a586d462e..7109baa4dad 100644 --- a/app/views/layouts/nav/_new_dashboard.html.haml +++ b/app/views/layouts/nav/_new_dashboard.html.haml @@ -1,5 +1,5 @@ %ul.list-unstyled.navbar-sub-nav - = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do + = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "home"}) do = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do Projects |