14 files changed, 24 insertions, 51 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;
   }
 }
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 1ea91a1914f..207ab22f4c7 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -4,10 +4,10 @@
   %body{class: "#{app_theme} admin", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Admin area"
-    = render "layouts/flash"
     %nav.main-nav.navbar-collapse.collapse
       .container= render 'layouts/nav/admin'
-
     .container
-      .content= yield
+      .content
+        = render "layouts/flash"
+        = yield
     = yield :embedded_scripts
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 511db389e0f..7d0819aa93e 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -4,9 +4,9 @@
   %body{class: "#{app_theme} application", :'data-page' => body_data_page }
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Dashboard"
-    = render "layouts/flash"
     %nav.main-nav.navbar-collapse.collapse
       .container= render 'layouts/nav/dashboard'
-
     .container
-      .content= yield
+      .content
+        = render "layouts/flash"
+        = yield
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index ffa48a68b42..06de03eadad 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -2,7 +2,6 @@
 %html{ lang: "en"}
   = render "layouts/head"
   %body.ui_basic.login-page
-    = render "layouts/flash"
     .container
       .content
         .login-title
@@ -10,6 +9,7 @@
     %hr
     .container
       .content
+        = render "layouts/flash"
         .row
           .col-md-7.brand-holder
             - if brand_item
diff --git a/app/views/layouts/errors.html.haml b/app/views/layouts/errors.html.haml
index d0e276d751a..16df9c10fbb 100644
--- a/app/views/layouts/errors.html.haml
+++ b/app/views/layouts/errors.html.haml
@@ -3,7 +3,7 @@
   = render "layouts/head", title: "Error"
   %body{class: "#{app_theme} application"}
     = render "layouts/head_panel", title: "" if current_user
-    = render "layouts/flash"
     .container.navless-container
+      = render "layouts/flash"
       .error-page
         = yield
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index fb4a3a3ba95..f22fb236cb5 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -4,9 +4,9 @@
   %body{class: "#{app_theme} application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: "group: #{@group.name}"
-    = render "layouts/flash"
     %nav.main-nav.navbar-collapse.collapse
       .container= render 'layouts/nav/group'
-
     .container
-      .content= yield
+      .content
+        = render "layouts/flash"
+        = yield
diff --git a/app/views/layouts/navless.html.haml b/app/views/layouts/navless.html.haml
index c43d688a2cb..2c5fffe384f 100644
--- a/app/views/layouts/navless.html.haml
+++ b/app/views/layouts/navless.html.haml
@@ -4,8 +4,7 @@
   %body{class: "#{app_theme} application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: @title
-    = render "layouts/flash"
-
     .container.navless-container
       .content
+        = render "layouts/flash"
         = yield
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 2d869a6cdcb..1d0ab84d26f 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -4,9 +4,9 @@
   %body{class: "#{app_theme} profile", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Profile"
-    = render "layouts/flash"
     %nav.main-nav.navbar-collapse.collapse
       .container= render 'layouts/nav/profile'
-
     .container
-      .content= yield
+      .content
+        = render "layouts/flash"
+        = yield
diff --git a/app/views/layouts/project_settings.html.haml b/app/views/layouts/project_settings.html.haml
index 5659cfab31d..c8b8f4ba971 100644
--- a/app/views/layouts/project_settings.html.haml
+++ b/app/views/layouts/project_settings.html.haml
@@ -5,15 +5,13 @@
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: project_title(@project)
     = render "layouts/init_auto_complete"
-    = render "layouts/flash"
     - if can?(current_user, :download_code, @project)
       = render 'shared/no_ssh'
-
     %nav.main-nav.navbar-collapse.collapse
       .container= render 'layouts/nav/project'
-
     .container
       .content
+        = render "layouts/flash"
         .row
           .col-md-2
             = render "projects/settings_nav"
diff --git a/app/views/layouts/projects.html.haml b/app/views/layouts/projects.html.haml
index f02eca6bd7c..8ad2f165946 100644
--- a/app/views/layouts/projects.html.haml
+++ b/app/views/layouts/projects.html.haml
@@ -5,13 +5,12 @@
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: project_title(@project)
     = render "layouts/init_auto_complete"
-    = render "layouts/flash"
     - if can?(current_user, :download_code, @project)
       = render 'shared/no_ssh'
-
     %nav.main-nav.navbar-collapse.collapse
       .container= render 'layouts/nav/project'
-
     .container
-      .content= yield
+      .content
+        = render "layouts/flash"
+        = yield
     = yield :embedded_scripts
diff --git a/app/views/layouts/search.html.haml b/app/views/layouts/search.html.haml
index 97ed8ba12df..084ff7ec830 100644
--- a/app/views/layouts/search.html.haml
+++ b/app/views/layouts/search.html.haml
@@ -4,8 +4,7 @@
   %body{class: "#{app_theme} application", :'data-page' => body_data_page}
     = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Search"
-    = render "layouts/flash"
-
     .container.navless-container
       .content
+        = render "layouts/flash"
         = yield
diff --git a/app/views/layouts/user_team.html.haml b/app/views/layouts/user_team.html.haml
deleted file mode 100644
index ce13853ed7f..00000000000
--- a/app/views/layouts/user_team.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-!!! 5
-%html{ lang: "en"}
-  = render "layouts/head", title: "#{@team.name}"
-  %body{class: "#{app_theme} application", :'data-page' => body_data_page}
-    = render "layouts/broadcast"
-    = render "layouts/head_panel", title: "team: #{@team.name}"
-    = render "layouts/flash"
-    %nav.main-nav.navbar-collapse.collapse
-      .container= render 'layouts/nav/team'
-
-    .container
-      .content= yield