From: Saman Bemel-Benrud <samanpwbb@gmail.com>
Date: Wed, 16 Jan 2013 18:43:25 +0000 (+0000)
Subject: Cleanup followup
X-Git-Tag: live~5177
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b02844b42f17d20d61419d549ac2ed90653b24a3

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 255b846cf..046a1364c 100644
--- 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 4b2d6e83d..7fd21775e 100644
--- 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 831311615..c13ca2c09 100644
--- 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}"