diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-12-15 02:12:12 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-12-15 02:12:12 +0300 |
| commit | 142d5abc0cc7dc0ef3a108109862e19792d8a1b5 (patch) | |
| tree | 9462ae894c608c2a2cc78aeb0e0d6a5f507ab3bf /app/assets/stylesheets/pages/environments.scss | |
| parent | 79f74249023492bb691d4a167065a4f67d7c68b6 (diff) | |
| parent | 0b72554c1bb47c88361f9fbc6185f49767337368 (diff) | |
Merge branch 'variables' into 'master'
Removing and combining sass variables
* Removes/combines a good portion of our many shades of gray, according to https://gitlab.com/gitlab-org/gitlab-ce/uploads/207006b0aeadee57499c891f173198f4/Shades_of_grey_-_combined.png
* Renaming variables according to saturation etc will be in separate MR
See merge request !8052
Diffstat (limited to 'app/assets/stylesheets/pages/environments.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index e716f24c8e2..92dd9885ab8 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -66,14 +66,14 @@ .external-url, .dropdown-new { - color: $table-text-gray; + color: $gl-gray-light; } .dropdown-menu { .fa { margin-right: 6px; - color: $table-text-gray; + color: $gl-gray-light; } } @@ -84,7 +84,7 @@ .stop-env-link, .external-url { - color: $table-text-gray; + color: $gl-gray-light; .stop-env-icon { font-size: 14px; @@ -119,7 +119,7 @@ .badge { font-weight: normal; background-color: $gray-darker; - color: $gl-placeholder-color; + color: $gl-gray-light; vertical-align: baseline; } } |