diff options
author | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2017-01-05 19:58:15 +0000 |
---|---|---|
committer | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2017-01-05 19:58:15 +0000 |
commit | bd1e0c7e7bac7d32cd8e97f79abd1c9eb32a2e71 (patch) | |
tree | 09b56bc502da82afa8c1656fe44493338157f317 /app/assets/stylesheets/framework/nav.scss | |
parent | c1daa7d177eef223cb54c4185343f0fb9a1c04e2 (diff) | |
parent | 4a1a06f4c6a9fe21504258ac3c1b007853bfd98b (diff) | |
download | gitlab-ce-bd1e0c7e7bac7d32cd8e97f79abd1c9eb32a2e71.tar.gz |
Merge branch 'master' into '26207-add-hover-animations'
# Conflicts:
# app/assets/stylesheets/framework/variables.scss
Diffstat (limited to 'app/assets/stylesheets/framework/nav.scss')
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 257c67139f1..401c2d0f6ee 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -51,7 +51,7 @@ margin-bottom: -1px; font-size: 14px; line-height: 28px; - color: $gl-gray-light; + color: $gl-text-color-secondary; border-bottom: 2px solid transparent; &:hover, @@ -315,7 +315,7 @@ .fa-caret-down { margin-left: 5px; - color: $gl-gray-light; + color: $gl-text-color-secondary; } .dropdown { |