From f135bae082e0e90669b6807e8c9d46c5f04fa24e Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Mon, 18 Jan 2016 12:31:51 +0100
Subject: [PATCH] Improves styles for search results page

---
 app/assets/stylesheets/layout.scss         | 10 +++++++++-
 app/views/debates/index.html.erb           |  6 +++---
 app/views/proposals/index.html.erb         |  8 ++++----
 app/views/shared/_advanced_search.html.erb |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index b76e4052a..749c009b0 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -519,7 +519,7 @@ header {
   background: white;
   border-bottom: 1px solid $border;
   clear: both;
-  margin: $line-height 0 $line-height/2;
+  margin-bottom: $line-height/2;
 
   a {
     color: $text;
@@ -1037,6 +1037,13 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
   }
 }
 
+.search-results {
+
+  h2 {
+    margin-bottom: 0;
+  }
+}
+
 .advanced-search {
   float: left;
   margin: $line-height 0;
@@ -1052,6 +1059,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
 }
 
 .advanced-search-form {
+  margin-top: $line-height;
 
   select {
     height: $line-height*2;
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 1c3aba998..f1c12e1b7 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -9,16 +9,16 @@
   <div class="wrap row">
     <div id="debates" class="debates-list small-12 medium-9 column">
 
-      <div class="small-12 medium-7 left">
+      <div class="small-12 margin-top search-results">
         <% if @search_terms || @advanced_search_terms %>
-          <h2 class="margin-top">
+          <h2>
             <%= page_entries_info @debates %>
             <% if !@advanced_search_terms %>
               <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
             <% end %>
           </h2>
         <% elsif @tag_filter %>
-          <h2 class="margin-top">
+          <h2>
             <%= page_entries_info @debates %>
             <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
           </h2>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 4acda4655..3469ecdb9 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -9,19 +9,19 @@
   <div class="wrap row">
     <div id="proposals" class="proposals-list small-12 medium-9 column">
 
-      <div class="small-12 medium-7 left">
+      <div class="small-12 margin-top search-results">
         <% if @search_terms || @advanced_search_terms %>
-          <h2 class="margin-top">
+          <h2>
             <%= page_entries_info @proposals %>
             <% if !@advanced_search_terms %>
               <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
             <% end %>
           </h2>
         <% elsif @tag_filter %>
-          <h2 class="margin-top">
+          <h2>
             <%= page_entries_info @proposals %>
             <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
-        </h2>
+          </h2>
         <% end %>
       </div>
 
diff --git a/app/views/shared/_advanced_search.html.erb b/app/views/shared/_advanced_search.html.erb
index abeddd3da..2f0233b53 100644
--- a/app/views/shared/_advanced_search.html.erb
+++ b/app/views/shared/_advanced_search.html.erb
@@ -1,6 +1,6 @@
 <%= link_to t("shared.advanced_search.title"), "#", id: 'js-advanced-search-title', class: "advanced-search small" %>
 
-<div class="advanced-search-form margin-top clear">
+<div class="advanced-search-form clear">
   <%= form_tag search_path, method: :get do %>
     <div id='js-advanced-search' data-advanced-search-terms=<%= @advanced_search_terms.present? %> style="display: none">