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:

![Screen Shot 2015-03-04 at 15.40.21](https://gitlab.com/uploads/zedtux/gitlab-ci/df01775b25/Screen_Shot_2015-03-04_at_15.40.21.png)

See merge request !43

1 files changed, 7 insertions, 0 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;
+}