Eliminate separate browse.css asset

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 5f038d692099ef2a98ab5ccb30b2629efd8a8a89..5d65d5994ab1bc7e71d2ae1dfdbdbe8ce4836fe3 100644 (file)
--- 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 6c60349dd3121042b4a56a773fb0e2cf78d39524..f2f8b21fc6d9e511e3f19b04f7c32e74cc9b6e8f 100644 (file)
--- 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 a395b95eac3a568fec6cef80729cbab0b702e0cc..9fc915a126fdd81f81dd4a94e86b288bab5202ba 100644 (file)
--- 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 687dc4f9b63787e1af86c377d3a6d1095ff49c31..5727669bfa3c38d40b28d3345347530043bc4d4f 100644 (file)
--- 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 c18fd40b3efddcd8435d97899a4fe9aa7492477e..2d2560ef2ff51a5e52b584cc07962f0b8b3a034e 100644 (file)
--- 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 dc634e3af87958e334927dbff2a249f2d2540919..213e5108f744e7eeaa7bc4019b4c9c8d32d931de 100644 (file)
--- 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 486ada5c90a32dd94cdbac7828dce94297d4df9b..6112d834e5530781f9a6246b851f3ed836ba9a8d 100644 (file)
--- 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 598e0472811e7f01800dde7b3aff5b89d125bd86..3d1e2c57750fd67f44a47fee3a832f35673e1870 100644 (file)
--- 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 ddb8e288a6232ce81f74ace85b2829332913a1c4..a05d0c125d75c22875c0e4b14793aba889cd81f5 100644 (file)
--- 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 3557d8d8b90a5e0bfbcca736a234ff5e2aceb3a3..74cdcee41d45b823e06db68e5c401077ebd5d3fb 100644 (file)
--- 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 )