diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 5bed3ad32..edb11f9b5 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -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 { diff --git a/app/views/budgets/groups/show.html.erb b/app/views/budgets/groups/show.html.erb index e77311e07..9a1976ff2 100644 --- a/app/views/budgets/groups/show.html.erb +++ b/app/views/budgets/groups/show.html.erb @@ -1,12 +1,18 @@ -
+
+
+
+ <%= link_to budget_path(@budget), class: "back" do %> + + <%= t('shared.back') %> + <% end %> + +

<%= t("budgets.groups.show.title") %>

+
+
+
+ +
- <%= link_to budget_path(@budget), class: "back" do %> - - <%= t('shared.back') %> - <% end %> - -

<%= t("budgets.groups.show.title") %>

-
<% @group.headings.each_slice(7) do |slice| %>
diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 63d0287ab..509e79d65 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -7,8 +7,8 @@
-
- +
+
diff --git a/app/views/budgets/investments/_form.html.erb b/app/views/budgets/investments/_form.html.erb index 8e7643285..f625a5271 100644 --- a/app/views/budgets/investments/_form.html.erb +++ b/app/views/budgets/investments/_form.html.erb @@ -2,7 +2,7 @@ <%= render 'shared/errors', resource: @investment %>
-
+
<%= f.label :heading_id, t("budget.investments.form.heading") %> <%= f.select :heading_id, budget_heading_select_options(@budget), {include_blank: true, label: false} %>
@@ -44,8 +44,8 @@ <% end %> -
- <%= f.submit(class: "button", value: t("budget.investments.form.submit_buttons.#{action_name}")) %> +
+ <%= f.submit(class: "button expanded", value: t("budget.investments.form.submit_buttons.#{action_name}")) %>
<% end %> diff --git a/app/views/budgets/investments/new.html.erb b/app/views/budgets/investments/new.html.erb index 7695afdec..457fbd550 100644 --- a/app/views/budgets/investments/new.html.erb +++ b/app/views/budgets/investments/new.html.erb @@ -1,7 +1,6 @@ -
- -
-

<%= t("management.budget_investments.create") %>

+
+
+

<%= t("management.budget_investments.create") %>

<%= render '/budgets/investments/form', form_url: budget_investments_path(@budget) %>
diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb index ce4e46c71..22096a526 100644 --- a/app/views/budgets/show.html.erb +++ b/app/views/budgets/show.html.erb @@ -1,23 +1,38 @@ -
-
-
- <%= link_to budgets_path do %> +
+
+
+ <%= link_to budgets_path, class: "back" do %> <%= t('shared.back') %> <% end %> -

<%= @budget.name %> - <%= t("budgets.phases.#{@budget.phase}") %> -

+

<%= @budget.name %>

<%= @budget.description %> +
+
+

+ <%= t('budget.show.phase') %> +
+ <%= t("budgets.phases.#{@budget.phase}") %> +

+ <% 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 %> +
+ <%= t("budget.investments.index.sidebar.verified_only", + verify: link_to(t("budget.investments.index.sidebar.verify_account"), verification_path)).html_safe %> +
+ <% end %> + <% end %>
-
+
<%= t('budget.index.name') %> <%= t('budget.index.phase') %>
diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index 974f412eb..0a87c818f 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -127,3 +127,4 @@ en: heading: Heading price: Price no_heading: No Heading + phase: Actual phase diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml index 1a9f9554b..f98940f43 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -126,3 +126,4 @@ es: heading: Partida price: Cantidad no_heading: Sin lĂ­nea + phase: Fase actual
<%= t('budget.show.group') %>