summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_requests.scss
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2016-12-30 12:18:27 -0800
committertauriedavis <taurie@gitlab.com>2017-01-04 12:14:26 -0800
commit86b1dfc7a494b19a20cf677f040d2f9c8a1efad7 (patch)
treea6094e81d91bd5c5f09844d99434447e65b89027 /app/assets/stylesheets/pages/merge_requests.scss
parent7c2a4699b8bdd9d8abd193e4256694115b41fc07 (diff)
downloadgitlab-ce-86b1dfc7a494b19a20cf677f040d2f9c8a1efad7.tar.gz
25701 standardize text colors25701-standardize-text-colors
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 98d5967e76a..45ff9f7ff5f 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -4,7 +4,7 @@
*/
.mr-state-widget {
background: $gray-light;
- color: $gl-gray;
+ color: $gl-text-color;
border: 1px solid $border-color;
border-radius: 2px;
@@ -58,7 +58,7 @@
padding-right: 0;
a {
- color: $gl-gray;
+ color: $gl-text-color;
}
}
@@ -70,7 +70,7 @@
.ci_widget {
border-bottom: 1px solid $well-inner-border;
- color: $gl-gray;
+ color: $gl-text-color;
svg {
margin-right: 4px;
@@ -94,7 +94,7 @@
}
.normal {
- color: $gl-text-color-dark;
+ color: $gl-text-color;
}
.js-deployment-link {
@@ -106,7 +106,7 @@
font-weight: 600;
font-size: 16px;
margin: 5px 0;
- color: $gl-gray-dark;
+ color: $gl-text-color;
&.has-conflicts .fa-exclamation-triangle {
color: $gl-warning;
@@ -190,7 +190,7 @@
}
.label-branch {
- color: $gl-gray-dark;
+ color: $gl-text-color;
font-family: $monospace_font;
font-weight: bold;
overflow: hidden;
@@ -363,7 +363,7 @@
th {
background-color: $white-light;
- color: $gl-gray-light;
+ color: $gl-text-color-secondary;
}
}
}