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

[rails.git] / app / views / layouts / _banner.html.erb

diff --git a/app/views/layouts/_banner.html.erb b/app/views/layouts/_banner.html.erb
index 6a62e1944b61d6ed3da5bf2fde369ed29903b6f4..344c5ed711fb316e7e8e647fbe73db888beb3d84 100644 (file)
--- a/app/views/layouts/_banner.html.erb
+++ b/app/views/layouts/_banner.html.erb
@@ -1,4 +1,9 @@
 <% unless (banner = next_banner()).nil? %>
-<%= link_to (image_tag banner[:img], :alt => banner[:alt], :title => banner[:alt]), banner[:link] %>
-<div class="close-wrap" id="<%= cookie_id(banner[:id]) %>"><span class="icon close"></span></div>
+  <%= tag.div :id => "banner", :class => "position-relative", :data => { :bs_theme => token_list(:dark => banner[:dark]) } do %>
+    <%= link_to (image_tag banner[:img], :srcset => banner[:srcset], :alt => banner[:alt], :title => banner[:alt]), banner[:link] %>
+    <button type="button"
+            class="btn-close position-absolute top-0 end-0 m-4 opacity-100 bg-white bg-opacity-50"
+            id="<%= banner_cookie(banner[:id]) %>"
+            aria-label="<%= t("javascripts.close") %>"></button>
+  <% end %>
 <% end %>