summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-08 03:39:48 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-08 03:39:48 +0000
commit402767e0f5c32fa602125b8b09de12faac036d15 (patch)
treed151b9be893d0bd160f33331247125e85eec880b
parent703026c03e3967831cb61f09fa983fca3e0b1d1b (diff)
parent6e96035e265dd9072e32865c2973d77b4b72343f (diff)
downloadgitlab-ce-402767e0f5c32fa602125b8b09de12faac036d15.tar.gz
Merge branch '18074-cancel-pipeline-text' into 'master'
Change color of canceled ci text to gray ## What does this MR do? Change text color of Canceled builds from `$gl-danger` to `$gl-gray` ## What are the relevant issue numbers? Closes #18074 ## Screenshots (if relevant) <img src="/uploads/f2ac59c5081c31cfb34bdc0470e31384/Screen_Shot_2016-06-01_at_10.38.17_AM.png" width="600px"> See merge request !4412
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 8046e203a99..bf7334a8942 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -79,11 +79,14 @@
}
&.ci-failed,
- &.ci-canceled,
&.ci-error {
color: $gl-danger;
}
+ &.ci-canceled {
+ color: $gl-gray;
+ }
+
a.monospace {
color: inherit;
}