Merge pull request #2489 from consul/ui-fixes

UI fixes
This commit is contained in:
Alberto Calderón Queimadelos
2018-02-28 16:56:57 +01:00
committed by GitHub
6 changed files with 19 additions and 11 deletions

View File

@@ -117,6 +117,10 @@ a {
display: inline-block;
}
.aling-middle {
vertical-align: middle;
}
.sidebar-divider {
border-top: 1px solid $border;
margin-top: $line-height;

View File

@@ -1152,12 +1152,12 @@
min-height: $line-height * 10;
}
h1 {
h2 {
margin-bottom: 0;
}
h1,
h2,
h3,
.back,
.icon-angle-left,
p,

View File

@@ -23,13 +23,17 @@
</div>
<% if @ballot.valid_heading?(@heading) %>
<div class="progress-bar-nav" data-fixed-bar>
<h1><%= @heading.name %></h1>
<h2>
<%= t("budgets.investments.index.by_heading", heading: @heading.name) %>
</h2>
<div id="progress_bar" class="no-margin-top">
<%= render 'budgets/ballot/progress_bar' %>
</div>
</div>
<% else %>
<h1><%= @heading.name %></h1>
<h2>
<%= t("budgets.investments.index.by_heading", heading: @heading.name) %>
</h2>
<div class="small-12 medium-9">
<div class="callout warning">
<%= t("budgets.investments.header.different_heading_assigned_html",
@@ -47,11 +51,13 @@
</div>
<% end %>
<% else %>
<h1 class="margin-top"><%= @heading.name %></h1>
<h2>
<h2 class="margin-top">
<%= t("budgets.investments.index.by_heading", heading: @heading.name) %>
</h2>
<h3>
<span class="tagline"><%= t("budgets.investments.header.price") %></span>
<%= @budget.formatted_heading_price(@heading) %>
</h2>
</h3>
<% end %>
</div>
</div>

View File

@@ -43,10 +43,6 @@
definitions: link_to(t("budgets.investments.index.unfeasible_text_definitions"), "https://decide.madrid.es/participatory_budget_info#20")).html_safe %>
</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/advanced_search", search_path: budget_investments_url(@budget)) %>

View File

@@ -57,6 +57,7 @@ en:
description: Description
more_info: More information and context
index:
filter: Filter
filters:
open: Open processes
next: Next

View File

@@ -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