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

[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 51ef3fe41548d202bec942e39748e39b79a4e940..0f39c4a47f3f7d0df5f415422e4fc749ff5d1615 100644 (file)
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,20 +1,29 @@
 <% if flash[:error] %>
-  <p class="error">
-    <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
-    <%= raw flash[:error] %>
-  </p>
+  <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] %>
-  <p class="warning">
-    <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
-    <%= raw flash[:warning] %>
-  </p>
+  <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] %>
-  <p class="notice">
-    <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
-    <%= raw flash[:notice] %>
-  </p>
+  <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>
 <% end %>