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

[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 da559d55c924488dfaee1a789a001d5073110ba8..eaf3078fe6ba9bf3f4155bedb57aa215920ea03d 100644 (file)
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,11 +1,35 @@
 <% if flash[:error] %>
 <% if flash[:error] %>

-  <div id="error"><%= flash[:error] %></div>
+  <div class="alert alert-danger row mx-0 mb-0 p-3 rounded-0 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] %>
 <% end %>
 
 <% if flash[:warning] %>

-  <div id="warning"><%= flash[:warning] %></div>
+  <div class="alert alert-warning row mx-0 mb-0 p-3 rounded-0 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] %>
 <% end %>
 
 <% if flash[:notice] %>

-  <div id="notice"><%= flash[:notice] %></div>
+  <div class="alert alert-success row mx-0 mb-0 p-3 rounded-0 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>

 <% end %>
 <% end %>