Merge remote-tracking branch 'upstream/pull/2526'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index ae3b7c954c1cccb98f01d2655580bc5e203ca213..d3382eb3f24559a3466c85eca1f0d9cbb2f9342c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -902,6 +902,7 @@ header .search_forms,
     padding: 5px 20px 10px 15px;
     width: 100%;
     border-collapse: separate;
+    border-spacing: 0;
 }
 
 div.direction {
@@ -1026,6 +1027,7 @@ tr.turn:hover {
     border-radius: 3px;
     table-layout: fixed;
     border-collapse: separate;
+    border-spacing: 0;
 
     th, td {
       border-bottom: 1px solid $grey;

diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index 52502ad4b42c2e82deeb1470e3522cf9db37d0bc..6acc5e01ed9e5f0e5cbc99fe7dc7bb1002cd8adb 100644 (file)
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -12,7 +12,7 @@
 
     <% unless node.ways.empty? and node.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
-      <ul>
+      <ul class="list-unstyled">
         <% node.ways.uniq.each do |way| %>
           <li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
         <% end %>

diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb
index 452556364530c1c16ca77a578f665e81ad61b002..b54581b8bda2e34f0bcf480cd6683112b99f418a 100644 (file)
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -12,12 +12,12 @@
 
     <% unless relation.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
-      <ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %></ul>
+      <ul class="list-unstyled"><%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %></ul>
     <% end %>
 
     <% unless relation.relation_members.empty? %>
       <h4><%= t ".members" %></h4>
-      <ul><%= render :partial => "relation_member", :collection => relation.relation_members %></ul>
+      <ul class="list-unstyled"><%= render :partial => "relation_member", :collection => relation.relation_members %></ul>
     <% end %>
   </div>
 <% end %>

diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index 5560344a86e9dd4b733aa4bd68436a1803abfac4..137d529ff2a1296831a1c44d0c0be00d1dbd8cb6 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -12,14 +12,14 @@
 
     <% unless way.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
-      <ul>
+      <ul class="list-unstyled">
         <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
       </ul>
     <% end %>
 
     <% unless way.way_nodes.empty? %>
       <h4><%= t ".nodes" %></h4>
-      <ul>
+      <ul class="list-unstyled">
         <% way.way_nodes.each do |wn| %>
           <li>
             <%= link_to printable_name(wn.node), { :action => "node", :id => wn.node_id.to_s }, { :class => link_class("node", wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) } %>

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 76112e41eadb5c9ed165a0a008baacc5b101c7c6..9b68a03e79b46af71c6af4c825d908a10e0b043a 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -30,7 +30,7 @@
   <% if @comments.length > 0 %>
     <div class='changeset-comments'>
       <form action="#">
-        <ul>
+        <ul class="list-unstyled">
           <% @comments.each do |comment| %>
             <% if comment.visible %>
               <li id="c<%= comment.id %>">

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index 2389598bcb61b3612984d26d98d66908de9a3430..884f95d57914013481a76688b41e11d5110be888 100644 (file)
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -29,7 +29,7 @@
 
   <% if @note_comments.length > 1 %>
     <div class='note-comments'>
-      <ul>
+      <ul class="list-unstyled">
         <% @note_comments[1..-1].each do |comment| %>
           <li id="c<%= comment.id %>">
             <small class='deemphasize'><%= note_event(comment.event, comment.created_at, comment.author) %></small>