From: Eden Halperin Date: Wed, 6 Nov 2013 20:42:22 +0000 (-0500) Subject: Browse page style tweaks X-Git-Tag: live~5173^2~173 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/baaacfc7c08d8c5df5e67f4fafdbddf4e440c39d Browse page style tweaks --- diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index cdbf7e58d..fad878e79 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -643,7 +643,7 @@ nav.secondary { padding: $lineheight $lineheight $lineheight/2; } - h4 { + h4, span.user, span.date { font-weight: normal; color: #666; font-size: 12px; @@ -1067,7 +1067,7 @@ a.donate { } .comment a { - font-weight: bold; + font-weight: 500; color: #000; } } @@ -1109,12 +1109,14 @@ a.donate { } .browse-tag-list { - border: 1px solid #CCC; - border-radius: 4px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #ddd; font-size: 12px; + margin-left: -$lineheight; + margin-right: -$lineheight; li { - border-bottom: 1px solid #CCC; + border-bottom: 1px solid #ddd; } li:last-child { @@ -1127,17 +1129,16 @@ a.donate { width: 50%; height: 30px; float: left; - padding: 6px 10px; + padding: 6px 10px 6px $lineheight; } .browse-tag-k { font-weight: 500; background-color: #F6F6F6; - border-radius: 4px 0 0 4px; } .browse-tag-v { - border-left: 1px solid #CCC; + border-left: 1px solid #ddd; } } } diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index f336671f3..0f731875b 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,12 +1,10 @@
<% if common_details.changeset.tags['comment'].present? %> -
- <%= linkify(h(common_details.changeset.tags['comment'])) %> -
+ <%= linkify(h(common_details.changeset.tags['comment'])) %> <% else %> -
(no comment)
+ (no comment) <% end %> -
+

<% if common_details.visible? %> <%= t 'browse.common_details.edited' %> <% else %> @@ -18,15 +16,15 @@ <%= t 'browse.common_details.by' %> <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %> <% end %> -

+ -
+

<%= t 'browse.common_details.version' %> #<%= h(common_details.version) %> · <%= t 'browse.common_details.in_changeset' %> #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %> -

+
<%= render :partial => "tag_details", :object => common_details.tags %> diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index ac8a47069..08979c283 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -11,7 +11,7 @@ end %>

- +

<% created_at = distance_of_time_in_words_to_now(@changeset.created_at) closed_at = distance_of_time_in_words_to_now(@changeset.closed_at) @@ -27,7 +27,7 @@ <% if @changeset.user.data_public? %> by <%= link_to h(@changeset.user.display_name), :controller => "user", :action => "view", :display_name => @changeset.user.display_name %> <% end %> - +

<%= @@ -71,7 +71,7 @@ <% end %>
- <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> +

<%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %> · - <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %> + <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index a1da8c83f..c43c15468 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -10,8 +10,8 @@ <%= render :partial => "node_details", :object => @node %>
- <%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %> +

<%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %> · <%= link_to(t('browse.node.view_history'), :action => "node_history") %> - +

diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index 3d6349151..4dacaf929 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -9,8 +9,8 @@ <%= render :partial => "way_details", :object => @way %>
- <%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %> +

<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %> · <%= link_to(t('browse.way.view_history'), :action => "way_history") %> - +

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb index 9f0301da0..b6200a8ba 100644 --- a/app/views/changeset/list.html.erb +++ b/app/views/changeset/list.html.erb @@ -7,7 +7,7 @@ <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %> <% elsif params[:max_id] %> -

<%= t('changeset.list.no_more') %>

+

<%= t('changeset.list.no_more') %>

<% else %> -

<%= t('changeset.list.empty') %>

+

<%= t('changeset.list.empty') %>

<% end %>