diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-07-20 18:57:01 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-20 18:57:01 +0000 |
commit | 5eb307a1e087e9b11cbe637f28f27b3d84923c48 (patch) | |
tree | 968505eb0727886c75d6171607c30177ecd51b7d /app/assets/stylesheets | |
parent | f3ea58ef1b75df3ddebdada64a74eb75af8f5477 (diff) | |
parent | 2016f367f0e6f718e8e938bd85cd81d7a99d6c10 (diff) | |
download | gitlab-ce-5eb307a1e087e9b11cbe637f28f27b3d84923c48.tar.gz |
Merge branch 'cs-warn-on-failure' into 'master'
Warn on failure
## What does this MR do?
Adds styling and HTML for a `success_with_warnings` status in the MR widget. Unfinished as it needs some plumbing in the relevant CI controllers and models.
## Are there points in the code the reviewer needs to double check?
Not at the moment, though I think I'll probably need help getting this to work in the backend.
## What are the relevant issue numbers?
#17669
## Screenshots (if relevant)
![Screen_Shot_2016-06-29_at_12.02.49_PM](/uploads/af4a915689633fe028f44bb34ae7a5b1/Screen_Shot_2016-06-29_at_12.02.49_PM.png)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
cc: @ayufan
See merge request !5004
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/status.scss | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 5254faf723d..4e806e60e7e 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -70,6 +70,14 @@ color: $gl-success; } + &.ci-success_with_warnings { + color: $gl-success; + + i { + color: $gl-warning; + } + } + &.ci-skipped { background-color: #eee; color: #888; diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss index a22d4b6f6be..99f64b5e4cc 100644 --- a/app/assets/stylesheets/pages/status.scss +++ b/app/assets/stylesheets/pages/status.scss @@ -15,7 +15,8 @@ border-color: $gl-danger; } - &.ci-success { + &.ci-success, + &.ci-success_with_warnings { color: $gl-success; border-color: $gl-success; } @@ -57,9 +58,12 @@ .ci-status-icon-failed { color: $gl-danger; } - .ci-status-icon-pending { + + .ci-status-icon-pending, + .ci-status-icon-success_with_warning { color: $gl-warning; } + .ci-status-icon-running { color: $blue-normal; } |