Bundle leaflet css in a single asset

diff --git a/app/assets/stylesheets/leaflet-all.css b/app/assets/stylesheets/leaflet-all.css
new file mode 100644 (file)
index 0000000..153c568
--- /dev/null
+++ b/app/assets/stylesheets/leaflet-all.css
@@ -0,0 +1,6 @@
+/*
+ *= require leaflet
+ *= require leaflet.locationfilter
+ *= require leaflet.pan
+ *= require leaflet.zoom
+ */

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 17c58c792c1c33f05597d19d5259c98504e44185..44385f2be68f80ac9925f252a91627cc0600e8ce 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -5,9 +5,7 @@
   <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %>
   <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %>
   <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
   <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %>
   <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %>
   <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>

-  <%= stylesheet_link_tag "leaflet" %>
-  <%= stylesheet_link_tag "leaflet.locationfilter" %>
-  <%= stylesheet_link_tag "leaflet.pan", "leaflet.zoom" %>
+  <%= stylesheet_link_tag "leaflet-all" %>

   <!--[if IE]>
     <%= stylesheet_link_tag "leaflet.ie" %>
     <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>
   <!--[if IE]>
     <%= stylesheet_link_tag "leaflet.ie" %>
     <%= stylesheet_link_tag "large-#{dir}", :media => "screen" %>

diff --git a/config/environments/production.rb b/config/environments/production.rb
index cdedbeafb903576fd4387a878ecb49c6db7afa0e..937f1771a10f5803265b8c3f8521295246559005 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -61,7 +61,7 @@ OpenStreetMap::Application.configure do
   config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
   config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
   config.assets.precompile += %w( browse.css theme/openstreetmap/style.css )
   config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
   config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
   config.assets.precompile += %w( browse.css theme/openstreetmap/style.css )

-  config.assets.precompile += %w( leaflet.css leaflet.ie.css leaflet.locationfilter.css )
+  config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )

 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false