diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index a34a93694..81f1ad65c 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -501,6 +501,7 @@ header { margin: 0; margin-top: rem-calc(-24); padding: 0; + z-index: 9; } .is-submenu-item { @@ -1013,6 +1014,10 @@ form { background-color: $info-bg; border-color: $info-border; color: $color-info; + + a { + color: $link !important; + } } &.warning { diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index d507baaa4..8b84339eb 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -218,7 +218,7 @@ left: 0; line-height: $line-height; min-height: 100%; - padding: $line-height $line-height / 2; + padding: $line-height / 2; position: absolute; text-align: center; top: 0; @@ -1120,9 +1120,17 @@ text-decoration: underline; } + .callout { + + &.primary a { + color: $link; + } + } + .button { background: #fff; color: $budget; + text-decoration: none; } .info { @@ -1432,12 +1440,9 @@ background-color: $budget; transition: height 0.3s; - h1 { - transition: font-size 0.3s; - } - h2 { - margin-bottom: 0; + margin-bottom: $line-height / 2; + transition: font-size 0.3s; } &.is-fixed { @@ -1448,7 +1453,7 @@ top: 0; width: 100%; - h1 { + h2 { font-size: rem-calc(24); transition: font-size 0.3s; } @@ -1513,6 +1518,23 @@ } } +.budgets-stats { + + .header { + background: $highlight; + } + + .big-number-stat { + font-size: rem-calc(60); + font-weight: bold; + line-height: rem-calc(60); + + &.budget { + color: $budget; + } + } +} + // 07. Proposals successful // ------------------------- diff --git a/app/views/admin/budgets/_form.html.erb b/app/views/admin/budgets/_form.html.erb index 708f40de4..cb9500127 100644 --- a/app/views/admin/budgets/_form.html.erb +++ b/app/views/admin/budgets/_form.html.erb @@ -64,7 +64,10 @@ <% end %> <% if @budget.persisted? %> - <%= link_to t("admin.budgets.edit.delete"), admin_budget_path(@budget), method: :delete, class: "button hollow alert float-right" %> + <%= link_to t("admin.budgets.edit.delete"), + admin_budget_path(@budget), + method: :delete, + class: "button hollow alert float-right margin-left" %> <% end %> diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 936d71123..ff0a7a505 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -17,7 +17,7 @@

- <%= t('budgets.show.phase') %> + <%= t("budgets.show.phase") %>

<%= t("budgets.phase.#{current_budget.phase}") %>

diff --git a/app/views/budgets/investments/_header.html.erb b/app/views/budgets/investments/_header.html.erb index 90d2edfd4..e1da1ef5f 100644 --- a/app/views/budgets/investments/_header.html.erb +++ b/app/views/budgets/investments/_header.html.erb @@ -66,7 +66,9 @@
<%= back_link_to budget_path(@budget) %> -

<%= t('budgets.investments.index.title') %>

+

+ <%= t("budgets.investments.index.title") %> +

diff --git a/app/views/budgets/results/_results_table.html.erb b/app/views/budgets/results/_results_table.html.erb index 48983a858..bda81e268 100644 --- a/app/views/budgets/results/_results_table.html.erb +++ b/app/views/budgets/results/_results_table.html.erb @@ -2,9 +2,7 @@ style="<%= results_type != :compatible ? 'display: none' : '' %>" id="<%= results_type %>-container"> -

- <%= title %> -

+

<%= title %>

diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb index fe1fc876d..4699f9d8b 100644 --- a/app/views/budgets/results/show.html.erb +++ b/app/views/budgets/results/show.html.erb @@ -13,9 +13,12 @@
-
+
<%= back_link_to budgets_path %> -

<%= t("budgets.results.heading") %>
<%= @budget.name %>

+

+ <%= t("budgets.results.heading") %>
+ <%= @budget.name %> +

@@ -53,9 +56,12 @@
- <%= link_to t("budgets.results.show_all_link"), "#", class: "js-toggle-link button hollow margin-bottom", data: {'toggle-selector' => '.js-discarded', 'toggle-text' => t("budgets.results.hide_discarded_link")} %> -
+ <%= link_to t("budgets.results.show_all_link"), "#", + class: "js-toggle-link button hollow margin-bottom float-right-medium", + data: {'toggle-selector' => '.js-discarded', + 'toggle-text' => t("budgets.results.hide_discarded_link")} %> + <%= render 'results_table', results_type: :compatible, title: @heading.name, heading_price: @heading.price,