consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improves styles for search results page

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-01-18 12:31:51 +01:00
parent 4737f2be1b
commit f135bae082
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/layout.scss
View File

@@ -519,7 +519,7 @@ header {
background: white; background: white;
border-bottom: 1px solid $border; border-bottom: 1px solid $border;
clear: both; clear: both;
margin: $line-height 0 $line-height/2; margin-bottom: $line-height/2;
a { a {
color: $text; 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 { .advanced-search {
float: left; float: left;
margin: $line-height 0; margin: $line-height 0;
@@ -1052,6 +1059,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
} }
.advanced-search-form { .advanced-search-form {
margin-top: $line-height;
select { select {
height: $line-height*2; height: $line-height*2;

6
app/views/debates/index.html.erb
View File

@@ -9,16 +9,16 @@
<div class="wrap row"> <div class="wrap row">
<div id="debates" class="debates-list small-12 medium-9 column"> <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 %> <% if @search_terms || @advanced_search_terms %>
<h2 class="margin-top"> <h2>
<%= page_entries_info @debates %> <%= page_entries_info @debates %>
<% if !@advanced_search_terms %> <% if !@advanced_search_terms %>
<%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %> <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
<% end %> <% end %>
</h2> </h2>
<% elsif @tag_filter %> <% elsif @tag_filter %>
<h2 class="margin-top"> <h2>
<%= page_entries_info @debates %> <%= page_entries_info @debates %>
<%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %> <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
</h2> </h2>

6
app/views/proposals/index.html.erb
View File

@@ -9,16 +9,16 @@
<div class="wrap row"> <div class="wrap row">
<div id="proposals" class="proposals-list small-12 medium-9 column"> <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 %> <% if @search_terms || @advanced_search_terms %>
<h2 class="margin-top"> <h2>
<%= page_entries_info @proposals %> <%= page_entries_info @proposals %>
<% if !@advanced_search_terms %> <% if !@advanced_search_terms %>
<%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %> <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
<% end %> <% end %>
</h2> </h2>
<% elsif @tag_filter %> <% elsif @tag_filter %>
<h2 class="margin-top"> <h2>
<%= page_entries_info @proposals %> <%= page_entries_info @proposals %>
<%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
</h2> </h2>

2
app/views/shared/_advanced_search.html.erb
View File

@@ -1,6 +1,6 @@
<%= link_to t("shared.advanced_search.title"), "#", id: 'js-advanced-search-title', class: "advanced-search small" %> <%= 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 %> <%= form_tag search_path, method: :get do %>
<div id='js-advanced-search' data-advanced-search-terms=<%= @advanced_search_terms.present? %> style="display: none"> <div id='js-advanced-search' data-advanced-search-terms=<%= @advanced_search_terms.present? %> style="display: none">