From 5a00e23fa3200d95a27177dc5e392993e9dd0195 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Tue, 5 Nov 2013 11:57:26 -0800 Subject: [PATCH] Fix common details --- app/assets/stylesheets/common.css.scss | 16 ++++++++++++---- app/views/browse/_common_details.html.erb | 14 +++++++------- app/views/changeset/history.html.erb | 4 +++- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index bfbe971dd..3fddd669e 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -976,8 +976,12 @@ a.donate { } } -.browse_details { - position: relative; +/* Rules for entity history */ +#sidebar_content { + .browse_details { + position: relative; + border-bottom: $keyline; + } } .browse_status { @@ -1002,7 +1006,11 @@ a.donate { #sidebar_content { .browse-section { - padding: 20px; + padding: 10px 20px; + + h4 { + padding: 0; + } } .browse-field { @@ -1065,7 +1073,7 @@ a.donate { #sidebar_content { .browse-section.header { padding: 20px; - border-bottom: 1px solid #CCC; + border-bottom: $keyline; h2 { padding: 0 0 5px 0; diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 954c687ea..95ddafcd5 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,4 +1,11 @@
+ <% if common_details.changeset.tags['comment'].present? %> +
+ <%= linkify(h(common_details.changeset.tags['comment'])) %> +
+ <% else %> +
(no comment)
+ <% end %>
<% if common_details.visible? %> <%= t 'browse.common_details.edited' %> @@ -20,13 +27,6 @@ <%= t 'browse.common_details.in_changeset' %> #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
- - <% if common_details.changeset.tags['comment'].present? %> -
- <%= t 'browse.common_details.changeset_comment' %>: - <%= linkify(h(common_details.changeset.tags['comment'])) %> -
- <% end %>
<%= render :partial => "tag_details", :object => common_details %> diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb index 23cee14f7..d9f088836 100644 --- a/app/views/changeset/history.html.erb +++ b/app/views/changeset/history.html.erb @@ -20,7 +20,9 @@ end %> -

<%= @heading %>

+
+

<%= @heading %>

+
<%= image_tag "searching.gif", :class => "loader" %> -- 2.43.2