Merge branch 'improve-flash-message' into 'master'

Improve flash message

* dont fadeout so user can read
* show inside content block so user can notice it

See merge request !1119

3 files changed, 4 insertions, 14 deletions

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 6bae3d3c44f..86158d39ff1 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -149,7 +149,6 @@ $ ->
   if (flash = $(".flash-container")).length > 0
     flash.click -> $(@).fadeOut()
     flash.show()
-    setTimeout (-> flash.fadeOut()), 5000
 
   # Disable form buttons while a form is submitting
   $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
diff --git a/app/assets/javascripts/flash.js.coffee b/app/assets/javascripts/flash.js.coffee
index f8b7789884f..cf1a37eae3e 100644
--- a/app/assets/javascripts/flash.js.coffee
+++ b/app/assets/javascripts/flash.js.coffee
@@ -10,6 +10,5 @@ class Flash
 
     flash.click -> $(@).fadeOut()
     flash.show()
-    setTimeout (-> flash.fadeOut()), 5000
 
 @Flash = Flash
diff --git a/app/assets/stylesheets/generic/flash.scss b/app/assets/stylesheets/generic/flash.scss
index 95d28aaef6c..82eb50ad4be 100644
--- a/app/assets/stylesheets/generic/flash.scss
+++ b/app/assets/stylesheets/generic/flash.scss
@@ -1,25 +1,17 @@
 .flash-container {
-  display: none;
   cursor: pointer;
   margin: 0;
-  text-align: center;
-  color: #fff;
   font-size: 14px;
-  position: fixed;
-  bottom: 0;
   width: 100%;
-  opacity: 0.8;
   z-index: 100;
 
   .flash-notice {
-    background: #49C;
-    padding: 10px;
-    text-shadow: 0 1px 1px #178;
+    @extend .alert;
+    @extend .alert-info;
   }
 
   .flash-alert {
-    background: #C67;
-    text-shadow: 0 1px 1px #945;
-    padding: 10px;
+    @extend .alert;
+    @extend .alert-danger;
   }
 }