diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-17 08:20:45 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-17 12:49:36 -0600 |
| commit | 102587972d69ed7e34a1f4d8d8995a008692db90 (patch) | |
| tree | 59672aaf6ebd604860fcbce0b76ad573ad691c6a | |
| parent | 05ec7f8a0cb6d705ec2377c7b7d798f5eedea1f5 (diff) | |
| download | gitlab-ce-102587972d69ed7e34a1f4d8d8995a008692db90.tar.gz | |
Remove badge styling in dropdown; remove blue outline
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 12 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 0373bfc4ed5..3945a789c82 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -114,12 +114,6 @@ header { &.active a { font-weight: bold; } - - &:hover { - .badge { - background-color: $white-light; - } - } } } @@ -132,7 +126,11 @@ header { &:hover { background-color: $white-normal; - color: $gl-header-nav-hover-color; + } + + &:focus { + outline: none; + background-color: $white-normal; } } diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index bb611d39be5..5d4178f03d7 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -24,12 +24,12 @@ = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do %span Issues - %span.badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened)) + (#{number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened))}) = nav_link(path: 'dashboard#merge_requests') do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do %span Merge Requests - %span.badge= number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened)) + (#{number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened))}) = nav_link(controller: 'dashboard/snippets') do = link_to dashboard_snippets_path, title: 'Snippets' do %span |