Cleanup followup

Tighter copy on node list for to decrease the chance of an ugly line
break (need better fix here so the line break is smoother). Just changed
also part of way %{related_ways} to part of way %{related_ways}. This
needs a better fix to make line breaks indent properly, but this should
at least help a little (issue #185).

Properly positioned 'nearby users' block on user page to be in the left
column (issue #184).

Removed deemphasized class from search results (issue #181) lighter
highlight yellow on changesets page.

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 255b846cf8159a0634700ef46b7143d6cead09c0..046a1364cd4ed211d4cc302855ed5d0d70a3fdd9 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -879,7 +879,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     }
   }
   .selected {
-    background-color: rgb(255, 255, 160);
+    background: #FFFFC0;
   }
   .date,
   .user {
@@ -1005,6 +1005,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .activity-block {
+  clear: left;
   border-bottom: 1px solid #ccc;
   padding-bottom: 20px;
   float: left;

diff --git a/app/views/geocoder/results.html.erb b/app/views/geocoder/results.html.erb
index 4b2d6e83d69977ccd6c8c955494c8e5e0f75d039..7fd21775ec81264df6393a9f4f614824770e3f8a 100644 (file)
--- a/app/views/geocoder/results.html.erb
+++ b/app/views/geocoder/results.html.erb
@@ -3,7 +3,7 @@
 <% else %>
   <ul class='results-list'>
   <% @results.each do |result| %>
-    <li><p class="inner12 search_results_entry deemphasize"><%= result_to_html(result) %></p></li>
+    <li><p class="inner12 search_results_entry"><%= result_to_html(result) %></p></li>
   <% end %>
 </ul>
   <% if @more_params %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 831311615b007b89807fa0e58c4891aba202e98e..c13ca2c09195f49502503732fbe7557ffdcd02dd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -266,8 +266,8 @@ en:
       nodes: "Nodes:"
       part_of: "Part of:"
       also_part_of:
-        one: "also part of way %{related_ways}"
-        other: "also part of ways %{related_ways}"
+        one: "part of way %{related_ways}"
+        other: "part of ways %{related_ways}"
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: %{way_name}"