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

[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 2ba8ee95dae1bda9cadfd6ffb9592460a5bccab8..8b04dac91d465f44844ffe7145519c9375c70732 100644 (file)
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,8 +1,8 @@
 <% if flash[:error] %>
   <div class="flash error">
     <picture>
 <% if flash[:error] %>
   <div class="flash error">
     <picture>

-      <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml">
-      <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
+      <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[:error] %></div>
   </div>
     </picture>
     <div class="message"><%= flash[:error] %></div>
   </div>


@@ -11,8 +11,8 @@
 <% if flash[:warning] %>
   <div class="flash warning">
     <picture>
 <% if flash[:warning] %>
   <div class="flash warning">
     <picture>

-      <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml">
-      <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
+      <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>
     </picture>
     <div class="message"><%= flash[:warning] %></div>
   </div>


@@ -21,8 +21,8 @@
 <% if flash[:notice] %>
   <div class="flash notice">
     <picture>
 <% if flash[:notice] %>
   <div class="flash notice">
     <picture>

-      <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml">
-      <%= image_tag("notice.png", :class => "small_icon", :border => 0) %>
+      <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>
     </picture>
     <div class="message"><%= flash[:notice] %></div>
   </div>