diff --git a/app/webpacker/styles/_panel.scss b/app/webpacker/styles/_panel.scss index 27769db4b..2425e82e4 100644 --- a/app/webpacker/styles/_panel.scss +++ b/app/webpacker/styles/_panel.scss @@ -1,19 +1,9 @@ -.app-panel--informational { - background-color: govuk-colour("blue"); - color: govuk-colour("white"); - text-align: left; - - .app-panel__body { - @include govuk-font($size: 19); - margin: 0; - } -} - .app-panel--interruption { background-color: govuk-colour("blue"); color: govuk-colour("white"); text-align: left; + p, .govuk-body, .govuk-label, .govuk-fieldset__legend, @@ -21,6 +11,10 @@ color: govuk-colour("white"); } + a:not(:focus) { + color: inherit; + } + *:last-child { margin-bottom: 0; } @@ -31,4 +25,4 @@ border-color: govuk-colour("black"); background-color: govuk-colour("white"); } -} \ No newline at end of file +} diff --git a/config/locales/en.yml b/config/locales/en.yml index 8d50df783..0acb9b5b5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -144,7 +144,7 @@ en: soft_validations: net_income: - hint_text: "

You told us the main tenant's working situation is: %{ecstat1}

The household income you have entered is %{earnings}

" + hint_text: "

You told us the main tenant’s working situation is: %{ecstat1}

The household income you have entered is %{earnings}

" in_soft_min_range: message: "Net income is lower than expected based on the main tenant’s working situation. Are you sure this is correct?" in_soft_max_range: diff --git a/spec/features/form/validations_spec.rb b/spec/features/form/validations_spec.rb index 4b51eccea..34f6fbfd5 100644 --- a/spec/features/form/validations_spec.rb +++ b/spec/features/form/validations_spec.rb @@ -131,7 +131,7 @@ RSpec.describe "validations" do click_button("Save and continue") expect(page).to have_current_path("/logs/#{case_log.id}/net-income-value-check") expect(page).to have_content("Net income is outside the expected range based on the main tenant’s working situation") - expect(page).to have_content("You told us the main tenant's working situation is: Full-time – 30 hours or more") + expect(page).to have_content("You told us the main tenant’s working situation is: Full-time – 30 hours or more") expect(page).to have_content("The household income you have entered is £750.00 every week") choose("case-log-net-income-value-check-0-field", allow_label_click: true) click_button("Save and continue") diff --git a/spec/helpers/interuption_screen_helper_spec.rb b/spec/helpers/interuption_screen_helper_spec.rb index e6db8137a..3ad158857 100644 --- a/spec/helpers/interuption_screen_helper_spec.rb +++ b/spec/helpers/interuption_screen_helper_spec.rb @@ -25,7 +25,7 @@ RSpec.describe InteruptionScreenHelper do "argument" => %w[ecstat1 earnings], } expect(display_informative_text(informative_text, case_log)) - .to eq("

You told us the main tenant's working situation is: Full-time – 30 hours or more

The household income you have entered is £750.00 every week

") + .to eq("

You told us the main tenant’s working situation is: Full-time – 30 hours or more

The household income you have entered is £750.00 every week

") end end