diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-03-10 12:04:36 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-03-10 12:04:36 +0000 |
| commit | 5ab27205ad25288625403b7611980e2d00928068 (patch) | |
| tree | 7958e4489eb791fbe7ea8c712bc37af9ecd02aec | |
| parent | 1c10220fa8bb519c97e6aea1af9620ac38c8a285 (diff) | |
| parent | 6c7dfb5f37a4272144d6261fa48f1ab8d4d750fa (diff) | |
| download | gitlab-ci-5ab27205ad25288625403b7611980e2d00928068.tar.gz | |
Merge branch 'master' into 'master'
Change canceled builds color
Having the same color for the failed and canceled builds is not nice so I'm proposing the following change request which implement the new CSS class `.alert-disabled` and use it for canceled builds.
Here is the result:
See merge request !43
| -rw-r--r-- | app/assets/stylesheets/gl_bootstrap.scss | 7 | ||||
| -rw-r--r-- | app/helpers/builds_helper.rb | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/stylesheets/gl_bootstrap.scss b/app/assets/stylesheets/gl_bootstrap.scss index 7f45d64..b3f4449 100644 --- a/app/assets/stylesheets/gl_bootstrap.scss +++ b/app/assets/stylesheets/gl_bootstrap.scss @@ -218,3 +218,10 @@ ul.breadcrumb { position: relative; white-space: nowrap; } + +// alerts +.alert-disabled { + background-color: #e6e6e6; + border-color: #ebccd1; + color: #b0b0b0; +} diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb index 6266174..9f4eb11 100644 --- a/app/helpers/builds_helper.rb +++ b/app/helpers/builds_helper.rb @@ -28,8 +28,10 @@ module BuildsHelper def build_status_alert_class(build) if build.success? 'alert-success' - elsif build.failed? || build.canceled? + elsif build.failed? 'alert-danger' + elsif build.canceled? + 'alert-disabled' else 'alert-warning' end |