Merge branch 'fix-active-nav-badges' into 'master'

Fix active nav badges not inheriting the link color ## What does this MR do? Fix active navigation and tabs badges not inheriting the link color (in this case, black). ## Screenshots (if relevant) ![image](/uploads/ab4e8ea99531106f9ddc4297e10c327b/image.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7950

Merge branch 'fix-active-nav-badges' into 'master'
30136166 · Fatih Acet · 1413c94a · ee076287 · 30136166
Commit 30136166 authored Dec 09, 2016 by Fatih Acet
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

nav.scss app/assets/stylesheets/framework/nav.scss +4 -0

No files found.
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -71,6 +71,10 @@
      border-bottom: 2px solid $link-underline-blue;
      color: $black;
      font-weight: 600;
+
+      .badge {
+        color: $black;
+      }
    }

    .badge {