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:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-18 00:09:23 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-18 00:09:23 +0300
commit1d84a028b42a1a3aed36a0f3a6cae970c8df8e69 (patch)
tree1ebd0249d20169a0b8be47dc541e9c2676d62648 /app/views/layouts/_flash.html.haml
parentec72da1833d94bb1556af94193ccf2a93c9cb939 (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.haml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml
index 07c271be2f0..1424b9a7585 100644
--- a/app/views/layouts/_flash.html.haml
+++ b/app/views/layouts/_flash.html.haml
@@ -8,5 +8,6 @@
%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')
+ - if %w(alert notice success).include?(key)
+ %div{ class: "close-icon-wrapper js-close-icon" }
+ = sprite_icon('close', size: 16, css_class: 'close-icon')