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

improves styles displaying search results

Browse Source
This commit is contained in:
decabeza
2017-06-05 16:18:32 +02:00
parent 10d09686c3
commit f374478ddf
11 changed files with 98 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1106,10 +1106,6 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
// 09. Search
// ----------
.search-results h2 {
margin-bottom: 0;
}
.advanced-search {
float: left;
margin: $line-height 0;
@@ -1118,7 +1114,7 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
@include breakpoint(medium) {
float: right;
margin-bottom: 0;
margin-top: rem-calc(28);
margin-top: $line-height/4;
position: absolute;
right: 0;
z-index: 2;
@@ -1126,7 +1122,6 @@ img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar {
}
.advanced-search-form {
margin-top: $line-height;
select {
height: $line-height*2;

2
app/assets/stylesheets/print.css
View File

@@ -42,8 +42,6 @@ input[type="submit"] { display: none !important; }
.filters h2 { margin: 0 !important; font-size: 20px !important; line-height: 20px !important; width: auto !important; }
.search-results h2 { margin: 0 !important; font-size: 20px !important; line-height: 20px !important; }
.admin h2 { font-size: 20px !important; line-height: 20px !important; }
.select-order {

38
app/views/budgets/investments/index.html.erb
View File

@@ -18,28 +18,36 @@
<%= render '/budgets/investments/header' %>
<% end %>
<div class="wrap row">
<% if params[:search].present? %>
<div class="highlight no-margin-top padding margin-bottom">
<div class="row">
<div class="small-12 column">
<h2><%= t("shared.search_results") %></h2>
<p>
<%= page_entries_info @investments %>
<%= t("budgets.investments.index.search_results_html", count: @investments.size, search_term: params[:search]) %>
</p>
</div>
</div>
</div>
<% end %>
<div class="row">
<div id="budget-investments" class="budget-investments-list small-12 medium-9 column">
<div class="small-12 search-results margin-bottom">
<% if @current_filter == "unfeasible" %>
<% if @current_filter == "unfeasible" %>
<div class="small-12 margin-bottom">
<h2><%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %></h2>
<div class="callout primary margin">
<%= t("budgets.investments.index.unfeasible_text",
definitions: link_to(t("budgets.investments.index.unfeasible_text_definitions"), "https://decide.madrid.es/participatory_budget_info#20")).html_safe %>
</div>
<% else %>
<%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %>
<% end %>
<% if params[:search].present? %>
<h2>
<%= page_entries_info @investments %>
<%= t("budgets.investments.index.search_results", count: @investments.size, search_term: params[:search]) %>
</h2>
<% end %>
</div>
</div>
<% elsif @heading.present? %>
<div class="small-12 margin-bottom">
<h2><%= t("budgets.investments.index.by_heading", heading: @heading.name) %></h2>
</div>
<% end %>
<%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless @current_filter == "unfeasible" %>

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

@@ -11,25 +11,33 @@
<main>
<h1 class="sr-only"><%= t("shared.outline.debates") %></h1>
<% if @search_terms || @advanced_search_terms || @tag_filter %>
<div class="highlight no-margin-top padding margin-bottom">
<div class="row">
<div class="small-12 column">
<% if @search_terms || @advanced_search_terms %>
<h2><%= t("shared.search_results") %></h2>
<p>
<%= page_entries_info @debates %>
<% if !@advanced_search_terms %>
<%= t("debates.index.search_results_html", count: @debates.size, search_term: @search_terms) %>
<% end %>
</p>
<% elsif @tag_filter %>
<h2><%= t("shared.search_results") %></h2>
<p>
<%= page_entries_info @debates %>
<%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
</p>
<% end %>
</div>
</div>
</div>
<% end %>
<div class="row">
<div id="debates" class="debates-list small-12 medium-9 column">
<div class="small-12 search-results">
<% if @search_terms || @advanced_search_terms %>
<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>
<%= page_entries_info @debates %>
<%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
</h2>
<% end %>
</div>
<% if has_banners? %>
<%= render "shared/banner" %>
<% end %>

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

@@ -11,26 +11,34 @@
<main>
<h1 class="sr-only"><%= t("shared.outline.proposals") %></h1>
<div class="row">
<div id="proposals" class="proposals-list small-12 medium-9 column">
<div class="small-12 search-results">
<% if @search_terms || @advanced_search_terms %>
<h2>
<% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %>
<div class="highlight no-margin-top padding margin-bottom">
<div class="row">
<div class="small-12 column">
<% if @search_terms || @advanced_search_terms %>
<h2><%= t("shared.search_results") %></h2>
<p>
<%= page_entries_info @proposals %>
<% if !@advanced_search_terms %>
<%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
<%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %>
<% end %>
</h2>
<% elsif @tag_filter %>
<h2>
<%= page_entries_info @proposals %>
<%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
</h2>
<% elsif params[:retired].present? %>
<h2><%= t("proposals.index.retired_proposals") %>
<% end %>
<p>
<% elsif @tag_filter %>
<h2><%= t("shared.search_results") %></h2>
<p>
<%= page_entries_info @proposals %>
<%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
</p>
<% elsif params[:retired].present? %>
<h2><%= t("proposals.index.retired_proposals") %></h2>
<% end %>
</div>
</div>
</div>
<% end %>
<div class="row">
<div id="proposals" class="proposals-list small-12 medium-9 column">
<% if has_banners? %>
<%= render "shared/banner" %>