Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sidebar styling fixes #2526

Merged
merged 2 commits into from
Jan 30, 2020
Merged

Sidebar styling fixes #2526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e22b9c3
Remove list styling from various sidebar lists
gravitystorm Jan 30, 2020
9ce2822
Fix border spacing for sidebar tags and routing tables
gravitystorm Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/assets/stylesheets/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,7 @@ header .search_forms,
padding: 5px 20px 10px 15px;
width: 100%;
border-collapse: separate;
border-spacing: 0;
}

div.direction {
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/views/browse/_node.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/browse/_relation.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>
4 changes: 2 additions & 2 deletions app/views/browse/_way.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) } %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/browse/changeset.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %>">
Expand Down
2 changes: 1 addition & 1 deletion app/views/browse/note.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down