diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-25 15:55:08 +0100 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-03-25 15:55:08 +0100 |
commit | 80c3cbfb1d0ba86db5602de211358240b5e165ee (patch) | |
tree | e06f98fa6b5615fa8bb7d06f6f34c1e5bba752f0 /app | |
parent | 02b585e9248e28272c3a9620a0d4218e2420ff11 (diff) | |
download | gitlab-ce-80c3cbfb1d0ba86db5602de211358240b5e165ee.tar.gz |
Make sure ci status colors are same and respected on most pagesfix-link-colors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/status.scss | 92 |
1 files changed, 48 insertions, 44 deletions
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index aed898b34af..1a697f81652 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -1,54 +1,58 @@ -.ci-status { - padding: 2px 7px; - margin-right: 5px; - border: 1px solid #eee; - white-space: nowrap; - @include border-radius(4px); +body .content { + .ci-status { + padding: 2px 7px; + margin-right: 5px; + border: 1px solid #eee; + white-space: nowrap; + @include border-radius(4px); - &:hover { - text-decoration: none; - } + &:hover { + text-decoration: none; + } - &.ci-failed { - color: $gl-danger; - border-color: $gl-danger; - } + &.ci-failed { + color: $gl-danger; + border-color: $gl-danger; + } - &.ci-success { - color: $gl-success; - border-color: $gl-success; - } + &.ci-success { + color: $gl-success; + border-color: $gl-success; + } - &.ci-info { - color: $gl-info; - border-color: $gl-info; - } + &.ci-info { + color: $gl-info; + border-color: $gl-info; + } - &.ci-disabled { - color: $gl-gray; - border-color: $gl-gray; + &.ci-canceled, + &.ci-skipped, + &.ci-disabled { + color: $gl-gray; + border-color: $gl-gray; + } + + &.ci-pending, + &.ci-running { + color: $gl-warning; + border-color: $gl-warning; + } } - &.ci-pending, - &.ci-running { + .ci-status-icon-success { + color: $gl-success; + } + .ci-status-icon-failed { + color: $gl-danger; + } + .ci-status-icon-running, + .ci-status-icon-pending { color: $gl-warning; - border-color: $gl-warning; } -} - -.ci-status-icon-success { - color: $gl-text-green !important; -} -.ci-status-icon-failed { - color: $gl-text-red !important; -} -.ci-status-icon-running, -.ci-status-icon-pending { - color: $gl-text-orange !important; -} -.ci-status-icon-canceled, -.ci-status-icon-disabled, -.ci-status-icon-not-found, -.ci-status-icon-skipped { - color: $gl-gray !important; + .ci-status-icon-canceled, + .ci-status-icon-disabled, + .ci-status-icon-not-found, + .ci-status-icon-skipped { + color: $gl-gray; + } } |