From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 19 Oct 2012 22:53:06 +0000 (-0700)
Subject: Bundle leaflet css in a single asset
X-Git-Tag: live~5195^2~33
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6054eea2383438cf0439175a2dd7216476f60971?ds=sidebyside

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
index 000000000..153c5684f
--- /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 17c58c792..44385f2be 100644
--- 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 "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" %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cdedbeafb..937f1771a 100644
--- 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( 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