Float the close icon, closes #40

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 451d4594859fe1531738372de40726b877f2ec89..458ec09355ed864430242ee49b2bad15cdc441a5 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -651,8 +651,7 @@ nav.secondary {
     }
 
     .icon.close {
-      position: absolute;
-      right: $lineheight;
+      float: right;
       cursor: pointer;
     }
 

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 4e74c5ee07d5e220687f02a21464480937756477..5063d6e079a6927a410fde9b7e3ebd30e76e59bf 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,6 +1,6 @@
 <h2>
-  <%= t 'browse.changeset.changeset', :id => @changeset.id %>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t 'browse.changeset.changeset', :id => @changeset.id %>
 </h2>
 
 <div class="browse-section">

diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index 8302f472d0cfd478bf723bacfd9cc461c046d767..0c81b411c7a2f6e03adf300af9e89351348b036a 100644 (file)
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -3,8 +3,9 @@
 @title = t('browse.node.node') + ' | ' + @name
 %>
 
-<h2><%= t'browse.node.node_title', :node_name => @name %>
+<h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= 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 cbf7853f2e2610655e4f63440605c6dbcb14d29f..8bc4ed8ab5c0d2e6ac4592d27736d5d23935e2bc 100644 (file)
--- a/app/views/browse/node_history.html.erb
+++ b/app/views/browse/node_history.html.erb
@@ -3,8 +3,9 @@
 @title = t('browse.node_history.node_history') + ' | ' + @name
 %>
 
-<h2><%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>
+<h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= 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 061a86b067c220ac2a3dffa37396fdc98c42db94..948cd3a06315ba2cbb0335c1f42621b2ec12e241 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -1,5 +1,6 @@
-<h2><%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
+<h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %>
 </h2>
 <div class="browse-section">
   <span>

diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index 2db0d0f44bd3f7ef613d282c38bcc45e90648a63..125efb0d60dca95603f47f5b00e9538bf03507f2 100644 (file)
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -3,8 +3,9 @@
 @title = t('browse.relation.relation') + ' | ' + @name
 %>
 
-<h2><%= t'browse.relation.relation_title', :relation_name => @name %>
+<h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= 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 653991b9d2affb8a6ef21419c112e17aab8d9dab..d059b11b449208195d0d1aa87f37767373664722 100644 (file)
--- a/app/views/browse/relation_history.html.erb
+++ b/app/views/browse/relation_history.html.erb
@@ -3,8 +3,9 @@
 @title = t('browse.relation_history.relation_history') + ' | ' + @name
 %>
 
-<h2><%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>
+<h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= 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 5b33bd49e829baef8715959001bc804395d32ebb..ce67fb8a91e9cac761c917401d1db47e2b72e8d9 100644 (file)
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -2,8 +2,9 @@
 @name = printable_name @way
 @title = t('browse.way.way') + ' | ' + @name
 %>
-<h2><%= t'browse.way.way_title', :way_name => @name %>
+<h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= 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 8959a3fd4b1a8a565a99e13b6d48ffca0c8631e5..a747572c1c87e772622b71dd14da12e8d2a0cd15 100644 (file)
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -3,8 +3,9 @@
 @title = t('browse.way_history.way_history') + ' | ' + @name
 %>
 
-<h2><%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>
+<h2>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+    <%= 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/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb
index e5cb104e95b8fa7ff931d011170a1f8838858434..022523efadee0a715a568c0282494d1340864c45 100644 (file)
--- a/app/views/changeset/history.html.erb
+++ b/app/views/changeset/history.html.erb
@@ -20,8 +20,9 @@
    end
 %>
 
-<h2><%= @heading %>
+<h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= @heading %>
 </h2>
 
 <div class="changesets">

diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb
index e3f8459390ac3061874bc34d65db7334673def71..ac655147a9a4f367df4f18fc1d0f3ed59fc0f395 100644 (file)
--- a/app/views/geocoder/search.html.erb
+++ b/app/views/geocoder/search.html.erb
@@ -1,6 +1,6 @@
 <h2>
-       <%= t('site.sidebar.search_results') %>
     <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+       <%= t('site.sidebar.search_results') %>
 </h2>
 <% @sources.each do |source| %>
   <h4 class="inner12"><%= raw(t "geocoder.search.title.#{source}") %></h4>

diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb
index 94a9a295de10513833efc39428089ea8472efa59..6a2131e9038b593056d11dce9f0af27c516bf040 100644 (file)
--- a/app/views/site/export.html.erb
+++ b/app/views/site/export.html.erb
@@ -1,5 +1,6 @@
-<h2><%= t 'export.start_rjs.export' %>
+<h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t 'export.start_rjs.export' %>
 </h2>
 
 <%= form_tag :controller => "export", :action => "finish" do %>