diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index d6c688100..0faa8ecc1 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1139,6 +1139,8 @@ .budget-header { background: $budget; margin-top: -$line-height; + padding-bottom: $line-height; + padding-top: $line-height; h1, h2, @@ -1154,19 +1156,6 @@ text-decoration: underline; } - .callout { - - &.primary a { - color: $link; - } - } - - .button { - background: #fff; - color: $budget; - text-decoration: none; - } - .confirmed { font-size: rem-calc(24); font-weight: bold; @@ -1182,6 +1171,24 @@ } } +.budget-subheader { + @include grid-row; + margin-bottom: $line-height; + margin-top: $line-height; + + .current-phase { + text-transform: uppercase; + } + + .button { + margin-top: $line-height / 2; + } + + .callout { + margin-bottom: 0; + } +} + .jumbo-budget { background: $budget; border-bottom: 1px solid $budget; diff --git a/app/views/budgets/ballot/_ballot.html.erb b/app/views/budgets/ballot/_ballot.html.erb index fcd2c9cd8..c320a1652 100644 --- a/app/views/budgets/ballot/_ballot.html.erb +++ b/app/views/budgets/ballot/_ballot.html.erb @@ -1,4 +1,4 @@ -
- <%= link_to t("budgets.index.section_header.help"), "#section_help" %> -
+- <%= t("budgets.show.phase") %> -
-+ <%= link_to t("budgets.index.section_header.help"), "#section_help" %> +
+<%= t("budgets.show.phase") %>
diff --git a/spec/system/budgets/budgets_spec.rb b/spec/system/budgets/budgets_spec.rb index 354ada7b0..f8e89a62a 100644 --- a/spec/system/budgets/budgets_spec.rb +++ b/spec/system/budgets/budgets_spec.rb @@ -42,7 +42,6 @@ describe "Budgets" do expect(page).to have_content(budget.name) expect(page).to have_content(budget.description) expect(page).to have_link("Help with participatory budgets") - expect(page).to have_link("See all phases") end expect(page).to have_content("Actual phase") @@ -51,7 +50,7 @@ describe "Budgets" do budget.update!(phase: "publishing_prices") visit budgets_path - within(".budget-header") do + within(".budget-subheader") do expect(page).to have_content("Publishing projects prices") end