diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 10:53:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 10:53:40 +0300 |
| commit | cfc792b9ca064990e6540cb742e80529ea669a81 (patch) | |
| tree | 147cd4256319990cebbc02fe8e4fbbbe06f5720a /app/views/layouts/_flash.html.haml | |
| parent | 93c6764dacd4c605027ef1cd367d3aebe420b223 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/_flash.html.haml')
| -rw-r--r-- | app/views/layouts/_flash.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml index a0b030fa3b2..de1caeaa50f 100644 --- a/app/views/layouts/_flash.html.haml +++ b/app/views/layouts/_flash.html.haml @@ -1,8 +1,9 @@ +-# We currently only support `alert`, `notice`, `success`, 'toast' .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 + - if key == 'toast' && value + .js-toast-message{ data: { message: value } } + - elsif value %div{ class: "flash-#{key} mb-2" } %span= value %div{ class: "close-icon-wrapper js-close-icon" } |