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

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

-  <div class="flash error">
-    <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
-    <div class="message"><%= raw flash[:error] %></div>
+  <div class="alert alert-danger row mx-0 mb-0 p-3 rounded-0 align-items-center">
+    <div class="col-auto">
+      <%= notice_svg_tag %>
+    </div>
+    <div class="col"><%= render_flash(flash[:error]) %></div>

   </div>
 <% end %>
 
 <% if flash[:warning] %>
   </div>
 <% end %>
 
 <% if flash[:warning] %>

-  <div class="flash warning">
-    <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
-    <div class="message"><%= raw flash[:warning] %></div>
+  <div class="alert alert-warning row mx-0 mb-0 p-3 rounded-0 align-items-center">
+    <div class="col-auto">
+      <%= notice_svg_tag %>
+    </div>
+    <div class="col"><%= render_flash(flash[:warning]) %></div>

   </div>
 <% end %>
 
 <% if flash[:notice] %>
   </div>
 <% end %>
 
 <% if flash[:notice] %>

-  <div class="flash notice">
-    <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
-    <div class="message"><%= raw flash[:notice] %></div>
+  <div class="alert alert-success row mx-0 mb-0 p-3 rounded-0 align-items-center">
+    <div class="col-auto">
+      <%= notice_svg_tag %>
+    </div>
+    <div class="col"><%= render_flash(flash[:notice]) %></div>

   </div>
 <% end %>
   </div>
 <% end %>