Mercurial > hg > soundsoftware-site

changeset 324:a89626bf10c7 cannam-pre-20110113-merge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Tue, 29 Mar 2011 11:14:27 +0100
parents 1fbfab2f1624 (current diff) 1333582e34c4 (diff)
children f1a12c3b4587
files
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/app/views/search/index.rhtml	Tue Mar 29 10:49:24 2011 +0100
+++ b/app/views/search/index.rhtml	Tue Mar 29 11:14:27 2011 +0100
@@ -19,11 +19,11 @@
 </div>
 
 <% if @results %>
+    
+    <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
     <div id="search-results-counts">
     <%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
     </div>
-    
-    <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
     <dl id="search-results">
       <% @results.each do |e| %>
         <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, :length => 255), @tokens), e.event_url %></dt>
--- a/public/stylesheets/application.css	Tue Mar 29 10:49:24 2011 +0100
+++ b/public/stylesheets/application.css	Tue Mar 29 11:14:27 2011 +0100
@@ -304,9 +304,9 @@
 
 #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
 
-div#search-results-counts {float:right;}
-div#search-results-counts ul { margin-top: 0.5em; }
-div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
+div#search-results-counts { display: block; padding-left: 0; margin-left: 0; }
+div#search-results-counts ul { margin-top: 0.5em; padding-left: 0; margin-left: 0; }
+div#search-results-counts li { display: inline; list-style-type: none; margin-right: 1em; }
   
 dt.issue { background-image: url(../images/ticket.png); }
 dt.issue-edit { background-image: url(../images/ticket_edit.png); }