diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 93ffd50bf..77de0628c 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -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; diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 4fd0f7461..75bbba32c 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -16,14 +16,13 @@ @mixin votes { border-top: 1px solid $border; margin-top: $line-height; - padding: $line-height 0; + padding: $line-height/2 0; position: relative; @include breakpoint(medium) { border-left: 1px solid $border; border-top: 0; margin-top: 0; - padding-top: $line-height*2; } .icon-like, .icon-unlike { @@ -514,45 +513,17 @@ padding-bottom: rem-calc(12); } - .label-debate, .label-proposal, .label-investment-project, .label-budget-investment { - background: none; - clear: both; - display: block; - font-size: rem-calc(12); - font-weight: bold; - line-height: $line-height; - padding-bottom: 0; - padding-left: 0; - padding-top: 0; - text-transform: uppercase; - } - - .label-debate { - color: $debates; - } - - .label-proposal { - color: $proposals-dark; - } - - .label-investment-project { - color: $budget; - } - - .label-budget-investment { - color: $budget; - } - h3 { font-weight: bold; - margin: 0; + margin-top: $line-height/2; a { color: $text; } } - .debate-content, .proposal-content, .investment-project-content, .budget-investment-content { + .debate-content, .proposal-content, + .investment-project-content, .budget-investment-content { margin: 0; min-height: rem-calc(180); position: relative; diff --git a/app/assets/stylesheets/print.css b/app/assets/stylesheets/print.css index de5a56a31..6b3e5d6f6 100644 --- a/app/assets/stylesheets/print.css +++ b/app/assets/stylesheets/print.css @@ -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 { diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index 9b29080dd..b8d6bdf10 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -19,7 +19,6 @@ class DebatesController < ApplicationController def index_customization @featured_debates = @debates.featured - @proposal_successfull_exists = Proposal.successful.exists? end def show diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 3a9db4c5d..17b1ff375 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -119,5 +119,4 @@ class ProposalsController < ApplicationController def load_successful_proposals @proposal_successful_exists = Proposal.successful.exists? end - end diff --git a/app/views/budgets/investments/_investment.html.erb b/app/views/budgets/investments/_investment.html.erb index 3155853cd..f65b9cfe5 100644 --- a/app/views/budgets/investments/_investment.html.erb +++ b/app/views/budgets/investments/_investment.html.erb @@ -6,8 +6,6 @@
<% cache [locale_and_user_status(investment), 'index', investment, investment.author] do %> - <%= t("budgets.investments.investment.title") %> -

<%= link_to investment.title, namespaced_budget_investment_path(investment) %>

diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index 4c6871826..4c96d3319 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -18,28 +18,36 @@ <%= render '/budgets/investments/header' %> <% end %> -

+ <% if params[:search].present? %> +
+
+
+

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @investments %> + <%= t("budgets.investments.index.search_results_html", count: @investments.size, search_term: params[:search]) %> +

+
+
+
+ <% end %> + +
-
- - <% if @current_filter == "unfeasible" %> + <% if @current_filter == "unfeasible" %> +

<%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %>

<%= 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 %>
- <% else %> - <%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %> - <% end %> - - <% if params[:search].present? %> -

- <%= page_entries_info @investments %> - <%= t("budgets.investments.index.search_results", count: @investments.size, search_term: params[:search]) %> -

- <% end %> -
+
+ <% elsif @heading.present? %> +
+

<%= t("budgets.investments.index.by_heading", heading: @heading.name) %>

+
+ <% end %> <%= render('shared/order_links', i18n_namespace: "budgets.investments.index") unless @current_filter == "unfeasible" %> diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb index d084a0241..03c53979d 100644 --- a/app/views/debates/_debate.html.erb +++ b/app/views/debates/_debate.html.erb @@ -5,8 +5,6 @@
- <%= t("debates.debate.debate") %> -

<%= link_to debate.title, debate %>

  diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index b7796f0ba..73cafe392 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -11,34 +11,38 @@

<%= t("shared.outline.debates") %>

+ <% if @search_terms || @advanced_search_terms || @tag_filter %> +
+
+
+ <% if @search_terms || @advanced_search_terms %> +

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @debates %> + <% if !@advanced_search_terms %> + <%= t("debates.index.search_results_html", count: @debates.size, search_term: @search_terms) %> + <% end %> +

+ <% elsif @tag_filter %> +

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @debates %> + <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %> +

+ <% end %> +
+
+
+ <% end %> +
-
- <% if @search_terms || @advanced_search_terms %> -

- <%= page_entries_info @debates %> - <% if !@advanced_search_terms %> - <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %> - <% end %> -

- <% elsif @tag_filter %> -

- <%= page_entries_info @debates %> - <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %> -

- <% end %> -
- <% if has_banners? %> <%= render "shared/banner" %> <% end %> - <% if @proposal_successful_exists %> - <%= render "proposals/successful_banner" %> - <% end %> - - <% unless @tag_filter || @search_terms || !has_featured? || @proposal_successful_exists %> + <% unless @tag_filter || @search_terms || !has_featured? %> <%= render "featured_debates" %> <% end %> diff --git a/app/views/management/proposals/index.html.erb b/app/views/management/proposals/index.html.erb index fde056902..aab5427da 100644 --- a/app/views/management/proposals/index.html.erb +++ b/app/views/management/proposals/index.html.erb @@ -9,7 +9,7 @@ <% if @search_terms %>

<%= page_entries_info @proposals %> - <%= 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 %>
diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb index 735e8bcec..c269146ab 100644 --- a/app/views/proposals/_proposal.html.erb +++ b/app/views/proposals/_proposal.html.erb @@ -8,8 +8,6 @@
<% cache [locale_and_user_status(proposal), 'index', proposal, proposal.author] do %> - <%= t("proposals.proposal.proposal") %> -

<%= link_to proposal.title, namespaced_proposal_path(proposal) %>

  @@ -47,8 +45,8 @@

<%= proposal.summary %>

+ <%= render "shared/tags", taggable: proposal, limit: 5 %> <% end %> - <%= render "shared/tags", taggable: proposal, limit: 5 %>
diff --git a/app/views/proposals/_successful_banner.html.erb b/app/views/proposals/_successful_banner.html.erb deleted file mode 100644 index 3bde0e097..000000000 --- a/app/views/proposals/_successful_banner.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -
- <%= link_to polls_path do %> -
-
-

<%= t("poll_questions.banner.featured_title") %>

-

<%= t("poll_questions.banner.info") %>

-
- <% end %> -
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index fb31e9af0..77a551fc6 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -11,34 +11,40 @@

<%= t("shared.outline.proposals") %>

-
-
- -
- <% if @search_terms || @advanced_search_terms %> -

+ <% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %> +
+
+
+ <% if @search_terms || @advanced_search_terms %> +

<%= t("shared.search_results") %>

+

<%= 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 %> -

- <% elsif @tag_filter %> -

- <%= page_entries_info @proposals %> - <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> -

- <% elsif params[:retired].present? %> -

<%= t("proposals.index.retired_proposals") %> - <% end %> +

+ <% elsif @tag_filter %> +

<%= t("shared.search_results") %>

+

+ <%= page_entries_info @proposals %> + <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> +

+ <% elsif params[:retired].present? %> +

<%= t("proposals.index.retired_proposals") %>

+ <% end %> +
+
+ <% end %> + +
+
<% if has_banners? %> <%= render "shared/banner" %> <% end %> - <% if @proposal_successful_exists %> - <%= render "successful_banner" %> - <% elsif @featured_proposals.present? %> + <% if @featured_proposals.present? %>