diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7e17cb531..944463b96 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2155,7 +2155,7 @@ table { } } - + .budget.expanded, + + .budget-header, + .jumbo { margin-top: 0; } diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 519cf6859..d6c688100 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1136,51 +1136,48 @@ // 06. Budgets // ----------- -.expanded { +.budget-header { + background: $budget; + margin-top: -$line-height; - &.budget { - background: $budget; - margin-top: -$line-height; + h1, + h2, + p, + a, + .back, + .icon-angle-left, + .description { + color: #fff; + } - h1, - h2, - p, - a, - .back, - .icon-angle-left, - .description { - color: #fff; + a { + text-decoration: underline; + } + + .callout { + + &.primary a { + color: $link; } + } - a { - text-decoration: underline; - } + .button { + background: #fff; + color: $budget; + text-decoration: none; + } - .callout { + .confirmed { + font-size: rem-calc(24); + font-weight: bold; + } - &.primary a { - color: $link; - } - } + .info { + background: #6a2a72; - .button { - background: #fff; - color: $budget; - text-decoration: none; - } - - .confirmed { - font-size: rem-calc(24); - font-weight: bold; - } - - .info { - background: #6a2a72; - - p { - margin-bottom: 0; - text-transform: uppercase; - } + p { + margin-bottom: 0; + text-transform: uppercase; } } } diff --git a/app/views/budgets/ballot/_ballot.html.erb b/app/views/budgets/ballot/_ballot.html.erb index e8e79300f..3c03f6363 100644 --- a/app/views/budgets/ballot/_ballot.html.erb +++ b/app/views/budgets/ballot/_ballot.html.erb @@ -1,4 +1,4 @@ -
+
<%= back_link_to @ballot_referer %> diff --git a/app/views/budgets/groups/show.html.erb b/app/views/budgets/groups/show.html.erb index 5ebb18ace..8d471e6e3 100644 --- a/app/views/budgets/groups/show.html.erb +++ b/app/views/budgets/groups/show.html.erb @@ -2,7 +2,7 @@ <%= render "shared/canonical", href: budget_group_url(filter: @current_filter) %> <% end %> -
+
<%= back_link_to budgets_path %> diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 8c460bbf8..348832170 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -7,7 +7,7 @@ <% end %> <% if current_budget.present? %> -
+
@@ -121,7 +121,7 @@ <% end %>
<% else %> -
+

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

diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb index 4fef4f6f0..967d5d2a0 100644 --- a/app/views/budgets/show.html.erb +++ b/app/views/budgets/show.html.erb @@ -2,7 +2,7 @@ <%= render "shared/canonical", href: budget_url(@budget, filter: @current_filter) %> <% end %> -
+
<%= back_link_to budgets_path %> diff --git a/spec/system/budgets/budgets_spec.rb b/spec/system/budgets/budgets_spec.rb index 959b9ef9f..354ada7b0 100644 --- a/spec/system/budgets/budgets_spec.rb +++ b/spec/system/budgets/budgets_spec.rb @@ -38,7 +38,7 @@ describe "Budgets" do visit budgets_path - within("#budget_heading") do + within(".budget-header") do expect(page).to have_content(budget.name) expect(page).to have_content(budget.description) expect(page).to have_link("Help with participatory budgets") @@ -51,7 +51,7 @@ describe "Budgets" do budget.update!(phase: "publishing_prices") visit budgets_path - within("#budget_heading") do + within(".budget-header") do expect(page).to have_content("Publishing projects prices") end