diff options
| author | Baldinof <baldinof@gmail.com> | 2015-11-06 23:45:33 +0100 |
|---|---|---|
| committer | Baldinof <baldinof@gmail.com> | 2015-11-06 23:45:33 +0100 |
| commit | e34904370f7383853ed9e1f5392ff76defda9530 (patch) | |
| tree | e42260cee6d917f2150551d03b9cb041c002888b /app/assets | |
| parent | f57d59226d5ba5de45b710876f2689da9cc2e0f4 (diff) | |
| download | gitlab-ce-e34904370f7383853ed9e1f5392ff76defda9530.tar.gz | |
Merge button has color from CI status
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index f0b3667acca..08e4bcdf529 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -19,6 +19,20 @@ .accept-merge-holder { .accept-action { display: inline-block; + + .accept_merge_request { + &.ci-pending, + &.ci-running { + @include btn-orange; + } + + &.ci-skipped, + &.ci-failed, + &.ci-canceled, + &.ci-error { + @include btn-red; + } + } } .accept-control { |