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/tw_bootstrap.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/tw_bootstrap.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index 28cbae9a449..12d56359d7d 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap.scss @@ -98,7 +98,7 @@ &.label-gray { background-color: $label-gray-bg; - color: $gl-gray; + color: $gl-text-color; text-shadow: none; } |