X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1a65c279aab2b99d13dbf5909a1a05ad52648b25..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/app/views/layouts/_flash.html.erb

diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index 5dda3ad5c..8a7ed6fe4 100644
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,35 +1,13 @@
-<% if flash[:error] %>
-  <div class="flash error row mx-0 p-3 align-items-center">
-    <div class="col-auto">
-      <picture>
-        <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml" />
-        <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %>
-      </picture>
-    </div>
-    <div class="col"><%= render_flash(flash[:error]) %></div>
-  </div>
-<% end %>
-
-<% if flash[:warning] %>
-  <div class="flash warning row mx-0 p-3 align-items-center">
-    <div class="col-auto">
-      <picture>
-        <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
-        <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %>
-      </picture>
-    </div>
-    <div class="col"><%= render_flash(flash[:warning]) %></div>
-  </div>
-<% end %>
-
-<% if flash[:notice] %>
-  <div class="flash notice row mx-0 p-3 align-items-center">
-    <div class="col-auto">
-      <picture>
-        <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
-        <%= image_tag("notice.png", :srcset => image_path("notice.svg")) %>
-      </picture>
-    </div>
-    <div class="col"><%= render_flash(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 %>