From ddc4ff329b97c3dd960597b414353ed4e15f6ea7 Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 27 Feb 2018 13:54:49 +0100 Subject: [PATCH 1/3] Fixes button vertical align on polls list --- app/assets/stylesheets/layout.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index cebd8c8eb..62133e470 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -117,6 +117,10 @@ a { display: inline-block; } +.aling-middle { + vertical-align: middle; +} + .sidebar-divider { border-top: 1px solid $border; margin-top: $line-height; From bd3929a7dca86bf68b17d4755894b91d8da81d8e Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 27 Feb 2018 13:58:25 +0100 Subject: [PATCH 2/3] Adds missing translation for legislation filter title --- config/locales/en/legislation.yml | 1 + config/locales/es/legislation.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/config/locales/en/legislation.yml b/config/locales/en/legislation.yml index 0e9d10d76..00f2263f4 100644 --- a/config/locales/en/legislation.yml +++ b/config/locales/en/legislation.yml @@ -57,6 +57,7 @@ en: description: Description more_info: More information and context index: + filter: Filter filters: open: Open processes next: Next diff --git a/config/locales/es/legislation.yml b/config/locales/es/legislation.yml index e2a6a63a6..9249abe01 100644 --- a/config/locales/es/legislation.yml +++ b/config/locales/es/legislation.yml @@ -57,6 +57,7 @@ es: description: En qué consiste more_info: Más información y contexto index: + filter: Filtro filters: open: Procesos activos next: Próximamente From 7a888b71fd93564c4ce6799bc3356698fdd506c8 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 28 Feb 2018 16:10:14 +0100 Subject: [PATCH 3/3] Removes duplicate heading info, fixes headings structure --- app/assets/stylesheets/participation.scss | 4 ++-- app/views/budgets/investments/_header.html.erb | 16 +++++++++++----- app/views/budgets/investments/index.html.erb | 4 ---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index aa1259bb3..404bea627 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1152,12 +1152,12 @@ min-height: $line-height * 10; } - h1 { + h2 { margin-bottom: 0; } - h1, h2, + h3, .back, .icon-angle-left, p, diff --git a/app/views/budgets/investments/_header.html.erb b/app/views/budgets/investments/_header.html.erb index d803ae9d6..c664abc01 100644 --- a/app/views/budgets/investments/_header.html.erb +++ b/app/views/budgets/investments/_header.html.erb @@ -23,13 +23,17 @@ <% if @ballot.valid_heading?(@heading) %>
-

<%= @heading.name %>

+

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

<%= render 'budgets/ballot/progress_bar' %>
<% else %> -

<%= @heading.name %>

+

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

<%= t("budgets.investments.header.different_heading_assigned_html", @@ -47,11 +51,13 @@
<% end %> <% else %> -

<%= @heading.name %>

-

+

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

+

<%= t("budgets.investments.header.price") %> <%= @budget.formatted_heading_price(@heading) %> -

+ <% end %>
diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index 6ca99cf14..8505f9248 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -43,10 +43,6 @@ definitions: link_to(t("budgets.investments.index.unfeasible_text_definitions"), "https://decide.madrid.es/participatory_budget_info#20")).html_safe %> - <% elsif @heading.present? %> -
-

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

-
<% end %> <%= render("shared/advanced_search", search_path: budget_investments_url(@budget)) %>