diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-12 10:58:59 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-12 10:58:59 +0000 |
| commit | 9cb3510aed0a758045d26fac3c3610a1496eb5a2 (patch) | |
| tree | 8019f1b9f4f695dc96573a266a7e04c2c87df046 | |
| parent | 5478ff6dc2ad59a7c7d91f61339e8acee9bbb434 (diff) | |
| parent | d5e080fbdead67480a3b1660ceb5acf8c35b735d (diff) | |
| download | gitlab-ce-33363-user-customize-callout-has-no-top-margin-on-projects-page.tar.gz | |
Merge branch '33132-change-icon-color' into 'master'33363-user-customize-callout-has-no-top-margin-on-projects-page
Always render warnings icon in orange
Closes #33132
See merge request !12061
| -rw-r--r-- | app/assets/stylesheets/pages/status.scss | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/33132-change-icon-color.yml | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index 4a284247143..4ed8617b6a3 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -19,8 +19,7 @@ overflow: visible; } - &.ci-failed, - &.ci-failed_with_warnings { + &.ci-failed { color: $red-500; border-color: $red-500; @@ -39,8 +38,7 @@ } } - &.ci-success, - &.ci-success_with_warnings { + &.ci-success { color: $green-600; border-color: $green-500; @@ -73,7 +71,9 @@ } } - &.ci-pending { + &.ci-pending, + &.ci-success_with_warnings, + &.ci-failed_with_warnings { color: $orange-600; border-color: $orange-500; diff --git a/changelogs/unreleased/33132-change-icon-color.yml b/changelogs/unreleased/33132-change-icon-color.yml new file mode 100644 index 00000000000..c0e148f985b --- /dev/null +++ b/changelogs/unreleased/33132-change-icon-color.yml @@ -0,0 +1,4 @@ +--- +title: Render CI statuses with warnings in orange +merge_request: +author: |