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

improves styles for budgets views

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2017-01-04 19:18:41 +01:00
parent 9c2857e75b
commit 8b1e8fed5b
8 changed files with 61 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/stylesheets/participation.scss
View File

@@ -856,9 +856,22 @@
.expanded.budget {
background: $budget;
h1, p, a {
h1, h2, p, a.back, .icon-angle-left {
color: white;
}
.button {
background: white;
color: $budget;
}
.info {
background: #6A2A72;
@include breakpoint(medium) {
border-top: rem-calc(6) solid #54225C;
}
}
}
.jumbo-budget {

22
app/views/budgets/groups/show.html.erb
View File

@@ -1,12 +1,18 @@
<div class="row budget-investments-scope margin-bottom">
<div class="expanded budget no-margin-top">
<div class="row">
<div class="small-12 medium-9 column padding">
<%= link_to budget_path(@budget), class: "back" do %>
<span class="icon-angle-left"></span>
<%= t('shared.back') %>
<% end %>
<h2><%= t("budgets.groups.show.title") %></h2>
</div>
</div>
</div>
<div class="row margin-top">
<div id="select-district" class="small-12 medium-7 column select-district">
<%= link_to budget_path(@budget), class: "back" do %>
<span class="icon-angle-left"></span>
<%= t('shared.back') %>
<% end %>
<h2><%= t("budgets.groups.show.title") %></h2>
<div class="row">
<% @group.headings.each_slice(7) do |slice| %>
<div class="small-6 medium-4 column end">

4
app/views/budgets/index.html.erb
View File

@@ -7,8 +7,8 @@
</div>
<div class="row margin-top">
<div class="small-12 medium-6 column">
<table class="table-fixed">
<div class="small-12 medium-9 column">
<table>
<thead>
<th><%= t('budget.index.name') %></th>
<th><%= t('budget.index.phase') %></th>

6
app/views/budgets/investments/_form.html.erb
View File

@@ -2,7 +2,7 @@
<%= render 'shared/errors', resource: @investment %>
<div class="row">
<div class="small-12 column">
<div class="small-12 medium-8 column">
<%= f.label :heading_id, t("budget.investments.form.heading") %>
<%= f.select :heading_id, budget_heading_select_options(@budget), {include_blank: true, label: false} %>
</div>
@@ -44,8 +44,8 @@
<% end %>
<div class="actions small-12 column">
<%= f.submit(class: "button", value: t("budget.investments.form.submit_buttons.#{action_name}")) %>
<div class="actions small-12 medium-6 large-4 end column">
<%= f.submit(class: "button expanded", value: t("budget.investments.form.submit_buttons.#{action_name}")) %>
</div>
</div>
<% end %>

7
app/views/budgets/investments/new.html.erb
View File

@@ -1,7 +1,6 @@
<div class="budget-investment-new">
<div class="small-12 medium-9 column end">
<h1 class=""><%= t("management.budget_investments.create") %></h1>
<div class="budget-investment-new row">
<div class="small-12 medium-9 column">
<h1><%= t("management.budget_investments.create") %></h1>
<%= render '/budgets/investments/form', form_url: budget_investments_path(@budget) %>
</div>

31
app/views/budgets/show.html.erb
View File

@@ -1,23 +1,38 @@
<div class="expanded budget no-margin-top padding">
<div class="row">
<div class="small-12 medium-9 column">
<%= link_to budgets_path do %>
<div class="expanded budget no-margin-top">
<div class="row" data-equalizer>
<div class="small-12 medium-9 column padding" data-equalizer-watch>
<%= link_to budgets_path, class: "back" do %>
<span class="icon-angle-left"></span>
<%= t('shared.back') %>
<% end %>
<h1><%= @budget.name %>
<small><%= t("budgets.phases.#{@budget.phase}") %></small>
</h1>
<h1><%= @budget.name %></h1>
<%= @budget.description %>
</div>
<div class="small-12 medium-3 column info padding" data-equalizer-watch>
<p>
<strong><%= t('budget.show.phase') %></strong>
<br>
<%= t("budgets.phases.#{@budget.phase}") %>
</p>
<% if @budget.accepting? %>
<% if current_user && current_user.level_two_or_three_verified? %>
<%= link_to t("budget.investments.index.sidebar.create"), new_budget_investment_path(@budget), class: "button margin-top" %>
<% else %>
<div class="callout warning margin-top">
<%= t("budget.investments.index.sidebar.verified_only",
verify: link_to(t("budget.investments.index.sidebar.verify_account"), verification_path)).html_safe %>
</div>
<% end %>
<% end %>
</div>
</div>
</div>
<div class="row margin-top">
<div class="small-12 medium-6 column">
<div class="small-12 medium-9 column">
<table class="table-fixed">
<thead>
<th><%= t('budget.show.group') %></th>