From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 3 Oct 2013 23:53:04 +0000 (-0700)
Subject: Eliminate separate browse.css asset
X-Git-Tag: live~4661^2~230
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/054f934f27e79ab0f7a25a89b6b719cc2cb0cb06

Eliminate separate browse.css asset
---

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 5f038d692..5d65d5994 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -2440,3 +2440,5 @@ a.button {
     &.infringement { background-position: 0px -160px; }
   }
 }
+
+@import 'browse';
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 6c60349dd..f2f8b21fc 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
-
 <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
 
 <div class='browse-section common'>
diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index a395b95ea..9fc915a12 100644
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -3,10 +3,6 @@
 @title = t('browse.node.node') + ' | ' + @name
 %>
 
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
-
 <h2><%= t'browse.node.node_title', :node_name => @name %></h2>
 
 <%= render :partial => "node_details", :object => @node %>
diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb
index 687dc4f9b..5727669bf 100644
--- a/app/views/browse/node_history.html.erb
+++ b/app/views/browse/node_history.html.erb
@@ -3,10 +3,6 @@
 @title = t('browse.node_history.node_history') + ' | ' + @name
 %>
 
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
-
 <h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %></h2>
 
 <% @node.old_nodes.reverse.each do |node| %>
diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index c18fd40b3..2d2560ef2 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,7 +1,3 @@
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
-
 <h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %></h2>
 
 <% if @note.comments.find { |comment| comment.author.nil? } -%>
diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index dc634e3af..213e5108f 100644
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -3,10 +3,6 @@
 @title = t('browse.relation.relation') + ' | ' + @name
 %>
 
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
-
 <h2><%= t'browse.relation.relation_title', :relation_name => @name %></h2>
 
 <%= render :partial => "relation_details", :object => @relation %>
diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb
index 486ada5c9..6112d834e 100644
--- a/app/views/browse/relation_history.html.erb
+++ b/app/views/browse/relation_history.html.erb
@@ -3,10 +3,6 @@
 @title = t('browse.relation_history.relation_history') + ' | ' + @name
 %>
 
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
-
 <h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %></h2>
 
 <% @relation.old_relations.reverse.each do |relation| %>
diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index 598e04728..3d1e2c577 100644
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -3,10 +3,6 @@
 @title = t('browse.way.way') + ' | ' + @name
 %>
 
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
-
 <h2><%= t'browse.way.way_title', :way_name => @name %></h2>
 
 <%= render :partial => "way_details", :object => @way %>
diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb
index ddb8e288a..a05d0c125 100644
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -3,10 +3,6 @@
 @title = t('browse.way_history.way_history') + ' | ' + @name
 %>
 
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'browse' %>
-<% end %>
-
 <h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %></h2>
 
 <% @way.old_ways.reverse.each do |way| %>
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 3557d8d8b..74cdcee41 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -73,7 +73,7 @@ OpenStreetMap::Application.configure do
   config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.js )
   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 leaflet-all.css leaflet.ie.css )
+  config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
   config.assets.precompile += %w( embed.js embed.css )
   config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
   config.assets.precompile += %w( potlatch2.swf )