Merge remote-tracking branch 'upstream/pull/5318'

[rails.git] / app / views / layouts / _flash.html.erb

diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index 0f39c4a47f3f7d0df5f415422e4fc749ff5d1615..8a7ed6fe4b643bbb08a9b8b8cdfec58f298581d7 100644 (file)
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,29 +1,13 @@
-<% if flash[:error] %>
-  <div class="flash error">
-    <picture>
-      <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml" />
-      <%= image_tag("notice.png", :srcset => image_path("notice.svg"), :class => "small_icon", :border => 0) %>
-    </picture>
-    <div class="message"><%= flash[:error] %></div>
-  </div>
-<% end %>
-
-<% if flash[:warning] %>
-  <div class="flash warning">
-    <picture>
-      <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
-      <%= image_tag("notice.png", :srcset => image_path("notice.svg"), :class => "small_icon", :border => 0) %>
-    </picture>
-    <div class="message"><%= flash[:warning] %></div>
-  </div>
-<% end %>
-
-<% if flash[:notice] %>
-  <div class="flash notice">
-    <picture>
-      <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
-      <%= image_tag("notice.png", :srcset => image_path("notice.svg"), :class => "small_icon", :border => 0) %>
-    </picture>
-    <div class="message"><%= flash[:notice] %></div>
-  </div>
+<% [[:error, :danger], [:warning, :warning], [:notice, :success]].each do |flash_type, bootstrap_type| %>
+  <% if flash[flash_type] %>
+    <%= tag.div :class => "alert alert-#{bootstrap_type} row mx-0 mb-0 p-3 rounded-0 align-items-center",
+                :data => { :turbo_temporary => true } do %>
+      <div class="col-auto">
+        <%= notice_svg_tag %>
+      </div>
+      <div class="col">
+        <%= render_flash flash[flash_type] %>
+      </div>
+    <% end %>
+  <% end %>

 <% end %>
 <% end %>