Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-09-03 12:03:35 +0300
committerKushal Pandya <kushalspandya@gmail.com>2019-09-03 12:03:35 +0300
commit3741402a241df2ad6ab28e4b76edafe5083ce733 (patch)
tree90c67bb90414724df6559cf1d2e6f22d4b3aa035 /app/views/layouts/_flash.html.haml
parentaf5f2424cace62f8712dbabfd60bb0f1c36f1590 (diff)
Make flash notifications sticky
This commit also unifies layout structure and remove no_container flag
Diffstat (limited to 'app/views/layouts/_flash.html.haml')
-rw-r--r--app/views/layouts/_flash.html.haml10
1 files changed, 4 insertions, 6 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml
index 2cdaa85bdaa..d673d7164b3 100644
--- a/app/views/layouts/_flash.html.haml
+++ b/app/views/layouts/_flash.html.haml
@@ -1,10 +1,8 @@
-- extra_flash_class = local_assigns.fetch(:extra_flash_class, nil)
-
-.flash-container.flash-container-page
+.flash-container.flash-container-page.sticky
-# We currently only support `alert`, `notice`, `success`
- flash.each do |key, value|
-# Don't show a flash message if the message is nil
- if value
- %div{ class: "flash-#{key}" }
- %div{ class: "#{(container_class unless fluid_layout)} #{(extra_flash_class unless @no_container)} #{@content_class}" }
- %span= value
+ %div{ class: "flash-content flash-#{key} rounded" }
+ %span= value
+ = sprite_icon('close', size: 16, css_class: 'close-icon')