diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-28 15:07:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-28 15:07:50 +0300 |
| commit | eb3a23aaaa99ef8ae08c7b440fad676e3c71a1af (patch) | |
| tree | bb74f64f73f4a20d4b4e3443c3e7defd4733a78d /app/views/layouts/_flash.html.haml | |
| parent | f3cfb235c76426ce5a18003bb80ba625097bf1d0 (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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml index ab4b3cf6afd..a74076dfa46 100644 --- a/app/views/layouts/_flash.html.haml +++ b/app/views/layouts/_flash.html.haml @@ -1,8 +1,11 @@ +- flash_container_no_margin = local_assigns.fetch(:flash_container_no_margin, false) +- flash_container_class = ('flash-container-no-margin' if flash_container_no_margin) + -# We currently only support `alert`, `notice`, `success`, 'toast', and 'raw' - icons = {'alert' => 'error', 'notice' => 'information-o', 'success' => 'check-circle'} - type_to_variant = {'alert' => 'danger', 'notice' => 'info', 'success' => 'success'} - closable = %w[alert notice success] -.flash-container.flash-container-page.sticky{ data: { qa_selector: 'flash_container' } } +.flash-container.flash-container-page.sticky{ data: { qa_selector: 'flash_container' }, class: flash_container_class } - flash.each do |key, value| - if key == 'toast' && value .js-toast-message{ data: { message: value } } |