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

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

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 9fdb2637f7f9550a9e143c82cb1800878901c427..bab19c217191fb089bc1681a5e93851c3df965dd 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,12 +1,15 @@
 <%= tag.head :data => application_data do %>
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 <%= tag.head :data => application_data do %>
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />

-  <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0" />
-  <%= javascript_include_tag "html5shiv/dist/html5shiv" unless browser.html5? %>
-  <%= javascript_include_tag "es5" unless browser.es5? %>
+  <meta name="viewport" content="width=device-width, initial-scale=1">

   <%= javascript_include_tag "es6" unless browser.es6? %>
   <%= javascript_include_tag "es6" unless browser.es6? %>

+  <%= javascript_include_tag "turbo", :type => "module" %>

   <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "i18n/#{I18n.locale}" %>
   <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "i18n/#{I18n.locale}" %>

-  <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %>
+  <% if preferred_color_scheme(:site) == "auto" %>
+    <%= stylesheet_link_tag "screen-auto-#{dir}", :media => "screen" %>
+  <% else %>
+    <%= stylesheet_link_tag "screen-manual-#{dir}", :media => "screen" %>
+  <% end %>

   <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
   <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
   <%= render :partial => "layouts/meta" %>
   <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
   <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
   <%= render :partial => "layouts/meta" %>