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

[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 5dda3ad5c88d717aea4101a5c2a1b701d801713b..d8adbd0fdc286d437efd2afcc68f442a0f433c2f 100644 (file)
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,34 +1,25 @@
 <% if flash[:error] %>
 <% if flash[:error] %>

-  <div class="flash error row mx-0 p-3 align-items-center">
+  <div class="alert alert-danger row mx-0 mb-0 p-3 rounded-0 align-items-center">

     <div class="col-auto">
     <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>
+      <%= notice_svg_tag %>

     </div>
     <div class="col"><%= render_flash(flash[:error]) %></div>
   </div>
 <% end %>
 
 <% if flash[:warning] %>
     </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="alert alert-warning row mx-0 mb-0 p-3 rounded-0 align-items-center">

     <div class="col-auto">
     <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>
+      <%= notice_svg_tag %>

     </div>
     <div class="col"><%= render_flash(flash[:warning]) %></div>
   </div>
 <% end %>
 
 <% if flash[:notice] %>
     </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="alert alert-success row mx-0 mb-0 p-3 rounded-0 align-items-center">

     <div class="col-auto">
     <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>
+      <%= notice_svg_tag %>

     </div>
     <div class="col"><%= render_flash(flash[:notice]) %></div>
   </div>
     </div>
     <div class="col"><%= render_flash(flash[:notice]) %></div>
   </div>