improves styles for unfeasible investments

This commit is contained in:
Alberto Garcia Cabeza
2017-01-16 18:45:42 +01:00
parent 5f7269a070
commit 45450d74ff
6 changed files with 40 additions and 21 deletions

View File

@@ -894,6 +894,11 @@
.info { .info {
background: #6A2A72; background: #6A2A72;
p {
margin-bottom: 0;
text-transform: uppercase;
}
@include breakpoint(medium) { @include breakpoint(medium) {
border-top: rem-calc(6) solid #54225C; border-top: rem-calc(6) solid #54225C;
} }

View File

@@ -7,11 +7,13 @@
</div> </div>
</div> </div>
<div class="row margin-top"> <% if params[:unfeasible] %>
<% if params[:unfeasible] %> <div class="row margin-top">
Propuestas inviables <div class="small-12 column">
<% end %> <h3><%= t("budgets.groups.show.unfeasible_title") %></h3>
</div> </div>
</div>
<% end %>
<div class="row margin-top"> <div class="row margin-top">
<div id="select-district" class="small-12 medium-7 column select-district"> <div id="select-district" class="small-12 medium-7 column select-district">
@@ -39,7 +41,9 @@
<% if params[:unfeasible].blank? %> <% if params[:unfeasible].blank? %>
<div class="row margin-top"> <div class="row margin-top">
<%= link_to t("budgets.investments.index.sidebar.unfeasible"), <div class="small-12 column">
budget_path(@budget, unfeasible: 1) %> <small><%= link_to t("budgets.groups.show.unfeasible"),
budget_path(@budget, unfeasible: 1) %></small>
</div>
</div> </div>
<% end %> <% end %>

View File

@@ -17,14 +17,15 @@
<div class="small-12 search-results margin-bottom"> <div class="small-12 search-results margin-bottom">
<% if params[:unfeasible].present? %> <% if params[:unfeasible].present? %>
<h2><%= t("budgets.investments.index.unfeasible") %></h2> <h2><%= t("budgets.investments.index.unfeasible") %>: <%= @heading.name %></h2>
<p> <div class="callout primary margin">
<%= t("budgets.investments.index.unfeasible_text", <%= 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 %> definitions: link_to(t("budgets.investments.index.unfeasible_text_definitions"), "https://decide.madrid.es/participatory_budget_info#20")).html_safe %>
</p> </div>
<% else %>
<%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %>
<% end %> <% end %>
<%= content_tag(:h2, t("budgets.investments.index.by_heading", heading: @heading.name)) if @heading.present? %>
<% if params[:search].present? %> <% if params[:search].present? %>
<h2> <h2>
<%= page_entries_info @investments %> <%= page_entries_info @investments %>

View File

@@ -1,5 +1,5 @@
<div class="expanded budget no-margin-top"> <div class="expanded budget no-margin-top">
<div class="row" data-equalizer> <div class="row" data-equalizer data-equalizer-on="medium">
<div class="small-12 medium-9 column padding" data-equalizer-watch> <div class="small-12 medium-9 column padding" data-equalizer-watch>
<%= back_link_to budgets_path %> <%= back_link_to budgets_path %>
@@ -10,9 +10,8 @@
<div class="small-12 medium-3 column info padding" data-equalizer-watch> <div class="small-12 medium-3 column info padding" data-equalizer-watch>
<p> <p>
<strong><%= t('budgets.show.phase') %></strong> <strong><%= t('budgets.show.phase') %></strong>
<br>
<%= t("budgets.phase.#{@budget.phase}") %>
</p> </p>
<h2><%= t("budgets.phase.#{@budget.phase}") %></h2>
<% if @budget.accepting? %> <% if @budget.accepting? %>
<% if current_user %> <% if current_user %>
@@ -38,12 +37,12 @@
<div class="row margin-top"> <div class="row margin-top">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
<% if params[:unfeasible] %>
<h3 class="margin-bottom"><%= t("budgets.show.unfeasible_title") %></h3>
<% end %>
<table class="table-fixed"> <table class="table-fixed">
<thead> <thead>
<th><%= t('budgets.show.group') %></th> <th><%= t('budgets.show.group') %></th>
<% if params[:unfeasible] %>
Propuestas inviables
<% end %>
</thead> </thead>
<tbody> <tbody>
<% @budget.groups.each do |group| %> <% @budget.groups.each do |group| %>
@@ -71,7 +70,9 @@
<% unless params[:unfeasible] %> <% unless params[:unfeasible] %>
<div class="row margin-top"> <div class="row margin-top">
<%= link_to t("budgets.investments.index.sidebar.unfeasible"), <div class="small-12 column">
budget_path(@budget, unfeasible: 1) %> <small><%= link_to t("budgets.show.unfeasible"),
budget_path(@budget, unfeasible: 1) %></small>
</div>
</div> </div>
<% end %> <% end %>

View File

@@ -22,6 +22,8 @@ en:
groups: groups:
show: show:
title: Select an option title: Select an option
unfeasible_title: Unfeasible investments
unfeasible: See unfeasible investments
phase: phase:
accepting: Accepting proposals accepting: Accepting proposals
reviewing: Reviewing proposals reviewing: Reviewing proposals
@@ -103,3 +105,5 @@ en:
show: show:
group: Group group: Group
phase: Actual phase phase: Actual phase
unfeasible_title: Unfeasible investments
unfeasible: See unfeasible investments

View File

@@ -22,6 +22,8 @@ es:
groups: groups:
show: show:
title: Selecciona una opción title: Selecciona una opción
unfeasible_title: Propuestas inviables
unfeasible: Ver propuestas inviables
phase: phase:
accepting: Aceptando propuestas accepting: Aceptando propuestas
reviewing: Revisando propuestas reviewing: Revisando propuestas
@@ -103,3 +105,5 @@ es:
show: show:
group: Grupo group: Grupo
phase: Fase actual phase: Fase actual
unfeasible_title: Propuestas inviables
unfeasible: Ver las propuestas inviables