diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 12:08:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-13 12:08:03 +0300 |
| commit | c3ad57034cc1cbd6d0ad02de7ac57f6004440c83 (patch) | |
| tree | b27a4424d2d5d930ffdaf1ef872851ce691d4e7a /app/views/layouts/_flash.html.haml | |
| parent | 6ede90f5dd63d4a1f5ba243b4ed5097bb1a0acab (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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml index de1caeaa50f..07c271be2f0 100644 --- a/app/views/layouts/_flash.html.haml +++ b/app/views/layouts/_flash.html.haml @@ -1,10 +1,12 @@ -# We currently only support `alert`, `notice`, `success`, 'toast' +- icons = {'alert' => 'error', 'notice' => 'information-o', 'success' => 'check-circle'}; .flash-container.flash-container-page.sticky - flash.each do |key, value| - if key == 'toast' && value .js-toast-message{ data: { message: value } } - elsif value %div{ class: "flash-#{key} mb-2" } + = sprite_icon(icons[key], size: 16, css_class: 'align-middle mr-1') unless icons[key].nil? %span= value %div{ class: "close-icon-wrapper js-close-icon" } = sprite_icon('close', size: 16, css_class: 'close-icon') |