From 9e2025ed6965bfd9a010bd3be9607862e2bf6e26 Mon Sep 17 00:00:00 2001 From: Donna-H Date: Thu, 9 Jan 2025 14:03:40 +0000 Subject: [PATCH 1/4] fix hover on static pages --- ds_judgements_public_ui/sass/includes/govuk_overrides/_grid.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/ds_judgements_public_ui/sass/includes/govuk_overrides/_grid.scss b/ds_judgements_public_ui/sass/includes/govuk_overrides/_grid.scss index 61bed198a..c79b4a982 100644 --- a/ds_judgements_public_ui/sass/includes/govuk_overrides/_grid.scss +++ b/ds_judgements_public_ui/sass/includes/govuk_overrides/_grid.scss @@ -67,6 +67,7 @@ .govuk-grid-column-one-third__grid_info_card_text { color: colour-var("accent-font-base"); text-decoration: underline; + text-decoration-color: colour-var("background-tint"); &:hover { text-decoration: none; From c249aeb7f14c8f081d786dd9a3d09392f66039fc Mon Sep 17 00:00:00 2001 From: James Harries Date: Thu, 9 Jan 2025 17:07:00 +0000 Subject: [PATCH 2/4] fix: simplify info cards --- .../sass/includes/_info_card.scss | 50 +++++++++++++++++++ ds_judgements_public_ui/sass/main.scss | 1 + .../info_cards_about_find_case_law.html | 36 ++++++------- 3 files changed, 66 insertions(+), 21 deletions(-) create mode 100644 ds_judgements_public_ui/sass/includes/_info_card.scss diff --git a/ds_judgements_public_ui/sass/includes/_info_card.scss b/ds_judgements_public_ui/sass/includes/_info_card.scss new file mode 100644 index 000000000..97bd7ec3f --- /dev/null +++ b/ds_judgements_public_ui/sass/includes/_info_card.scss @@ -0,0 +1,50 @@ +.info-cards { + display: flex; + flex-direction: column; + gap: $space-4; + + @media (min-width: $grid-breakpoint-medium) { + flex-direction: row; + } +} + +.info-card { + display: flex; + flex-direction: column; + gap: $space-4; + + padding: $space-8 $space-4; + + text-decoration: none; + + background-color: colour-var("accent-background-light"); + border-top: 4px solid $color-yellow; + + &:focus { + outline-offset: $space-2; + } + + &:hover { + background-color: colour-var("accent-background"); + + h3 { + text-decoration: none; + } + } + + h3 { + margin: 0; + color: colour-var("link"); + text-decoration: underline; + text-decoration-color: colour-var("link"); + + &:hover { + color: colour-var("link-hover"); + } + } + + p { + margin: 0; + color: colour-var("accent-font-base"); + } +} diff --git a/ds_judgements_public_ui/sass/main.scss b/ds_judgements_public_ui/sass/main.scss index 3a3ac869d..2dc985ccf 100644 --- a/ds_judgements_public_ui/sass/main.scss +++ b/ds_judgements_public_ui/sass/main.scss @@ -72,6 +72,7 @@ $govuk-focus-colour: colour-var("focus-outline"); @import "includes/service_introduction"; @import "includes/standard_text_template"; @import "includes/copy_to_clipboard_link"; +@import "includes/info_card"; // Cookies @import "includes/cookie_banner_overrides"; diff --git a/ds_judgements_public_ui/templates/includes/info_cards_about_find_case_law.html b/ds_judgements_public_ui/templates/includes/info_cards_about_find_case_law.html index a07983a02..d3628bbdd 100644 --- a/ds_judgements_public_ui/templates/includes/info_cards_about_find_case_law.html +++ b/ds_judgements_public_ui/templates/includes/info_cards_about_find_case_law.html @@ -4,25 +4,19 @@

Pages in this section

-
- + From 887c456eb4aa5265f9462ae32eb6236c25a6e858 Mon Sep 17 00:00:00 2001 From: Donna-H Date: Thu, 9 Jan 2025 20:13:46 +0000 Subject: [PATCH 3/4] simplify all info cards on landing pages and static --- .../sass/includes/_info_card.scss | 51 +++++ .../sass/includes/govuk_overrides/_grid.scss | 195 ------------------ .../includes/info_cards_courts_tribunals.html | 35 ++-- .../includes/info_cards_help_guidance.html | 34 ++- .../info_cards_judgments_decisions.html | 34 ++- .../includes/info_cards_privacy_policy.html | 34 ++- .../includes/info_cards_terms_policies.html | 35 ++-- .../includes/info_cards_terms_use.html | 34 ++- 8 files changed, 130 insertions(+), 322 deletions(-) diff --git a/ds_judgements_public_ui/sass/includes/_info_card.scss b/ds_judgements_public_ui/sass/includes/_info_card.scss index 97bd7ec3f..122406c0c 100644 --- a/ds_judgements_public_ui/sass/includes/_info_card.scss +++ b/ds_judgements_public_ui/sass/includes/_info_card.scss @@ -8,6 +8,16 @@ } } +.info-cards-landing { + display: flex !important; + flex-direction: column !important; + gap: $space-4 !important; + + @media (min-width: $grid-breakpoint-medium) { + flex-direction: row !important; + } +} + .info-card { display: flex; flex-direction: column; @@ -48,3 +58,44 @@ color: colour-var("accent-font-base"); } } + +.info-card-landing { + display: flex; + flex-direction: column; + gap: $space-4; + + padding: $space-8 $space-4; + + text-decoration: none; + + background-color: colour-var("accent-background-light"); + border-top: 4px solid $color-yellow; + + &:focus { + outline-offset: $space-2; + } + + &:hover { + background-color: colour-var("accent-background"); + + h3 { + text-decoration: none; + } + } + + h3 { + margin: 0; + color: colour-var("link"); + text-decoration: underline; + text-decoration-color: colour-var("link"); + + &:hover { + color: colour-var("link-hover"); + } + } + + p { + margin: 0; + color: colour-var("accent-font-base"); + } +} diff --git a/ds_judgements_public_ui/sass/includes/govuk_overrides/_grid.scss b/ds_judgements_public_ui/sass/includes/govuk_overrides/_grid.scss index c79b4a982..7974506f0 100644 --- a/ds_judgements_public_ui/sass/includes/govuk_overrides/_grid.scss +++ b/ds_judgements_public_ui/sass/includes/govuk_overrides/_grid.scss @@ -12,78 +12,6 @@ } } -.govuk-grid-column-two-thirds__info_cards { - display: flex; - flex-direction: row; - gap: $space-1; - margin-left: $space-2; -} - -.govuk-grid-column-one-third__info_cards { - max-width: 20rem; - margin: $space-2; - padding: $space-1 $space-7; - - text-decoration: underline; - text-decoration-color: colour-var("link"); - - background-color: colour-var("accent-background-light"); - border-top: 4px solid $color-yellow; - - &:hover { - text-decoration: none; - background-color: colour-var("accent-background"); - } - - @media (max-width: $grid-breakpoint-medium) { - min-width: 150%; - height: 6rem; - } -} - -.govuk-grid-column-one-third__grid_info_card_heading:hover { - color: $color-dark-blue; - text-decoration: none; -} - -.govuk-grid-column-one-third__grid_info_card_heading { - color: colour-var("link"); - text-decoration-color: colour-var("link"); - text-decoration-line: underline; - text-wrap: wrap; -} - -.govuk-grid-column-one-third__grid_info_card_heading:visited { - color: colour-var("link-visited"); - text-decoration-color: colour-var("link-visited"); - text-decoration-line: underline; -} - -.govuk-grid-column-one-third__grid_info_card_heading:hover { - color: colour-var("link"); - text-decoration: none; -} - -.govuk-grid-column-one-third__grid_info_card_text { - color: colour-var("accent-font-base"); - text-decoration: underline; - text-decoration-color: colour-var("background-tint"); - - &:hover { - text-decoration: none; - } - - @media (max-width: $grid-breakpoint-medium) { - margin: -1rem; - visibility: hidden; - } -} - -.grid-background-link { - text-decoration: none; - text-decoration-line: none; -} - .govuk-grid-column-full { margin-bottom: -15px; @@ -128,96 +56,6 @@ } } -.govuk-grid-column-two-thirds__info_terms_use { - display: flex; - flex-direction: row; - gap: 0; - - margin-top: -22px; - margin-left: $space-2; - - text-decoration: none; - - @media (max-width: $grid-breakpoint-medium) { - float: left; - flex-direction: column; - width: 75%; - } -} - -.govuk-grid-column-one-third__info_terms_use { - max-width: 23rem; - height: 16rem; - margin: $space-2; - padding: $space-1 $space-5; - - text-decoration: underline; - text-decoration-color: colour-var("link"); - - background-color: colour-var("accent-background-light"); - border-top: 4px solid $color-yellow; - - &:hover { - text-decoration: none; - background-color: colour-var("accent-background"); - } - - @media (max-width: $grid-breakpoint-medium) { - width: 100%; - height: 6rem; - } - - @media (min-width: $grid-breakpoint-large) { - max-width: 23rem; - height: 12rem; - } -} - -.govuk-grid-column-two-thirds__info_about_fcl { - display: flex; - flex-direction: row; - gap: 0; - - margin-top: -22px; - margin-left: $space-2; - - text-decoration: none; - - @media (max-width: $grid-breakpoint-medium) { - float: left; - flex-direction: column; - width: 75%; - } -} - -.govuk-grid-column-one-third__info_about_fcl { - max-width: 23rem; - height: 16rem; - margin: $space-2; - padding: $space-1 $space-5; - - text-decoration: underline; - text-decoration-color: colour-var("link"); - - background-color: colour-var("accent-background-light"); - border-top: 4px solid $color-yellow; - - &:hover { - text-decoration: none; - background-color: colour-var("accent-background"); - } - - @media (max-width: $grid-breakpoint-medium) { - width: 100%; - height: 6rem; - } - - @media (min-width: $grid-breakpoint-large) { - max-width: 23rem; - height: 12rem; - } -} - .govuk-grid-column-one-third__grid_info_heading { color: colour-var("link"); text-decoration-color: colour-var("link"); @@ -319,36 +157,3 @@ width: 66.6666666667%; } } - -.govuk-grid-column-one-third__info_cards_help { - max-width: 20rem; - margin: $space-2; - padding: $space-1 $space-4; - - text-decoration: underline; - text-decoration-color: colour-var("link"); - - background-color: colour-var("accent-background-light"); - border-top: 4px solid $color-yellow; - - &:hover { - text-decoration: none; - background-color: colour-var("accent-background"); - } - - @media (max-width: $grid-breakpoint-medium) { - min-width: 150%; - height: 6rem; - } - - @media (width >= 770px) { - height: 12rem; - padding-bottom: $space-10; - } - - @media (min-width: $grid-breakpoint-large) { - max-width: 23rem; - height: 11rem; - padding-bottom: none; - } -} diff --git a/ds_judgements_public_ui/templates/includes/info_cards_courts_tribunals.html b/ds_judgements_public_ui/templates/includes/info_cards_courts_tribunals.html index df8d824e6..fc79c61bf 100644 --- a/ds_judgements_public_ui/templates/includes/info_cards_courts_tribunals.html +++ b/ds_judgements_public_ui/templates/includes/info_cards_courts_tribunals.html @@ -1,29 +1,20 @@
-
-

You may also be interested in

-
+
+

You may also be interested in

+
-
- diff --git a/ds_judgements_public_ui/templates/includes/info_cards_help_guidance.html b/ds_judgements_public_ui/templates/includes/info_cards_help_guidance.html index 84179ef1b..c97e64925 100644 --- a/ds_judgements_public_ui/templates/includes/info_cards_help_guidance.html +++ b/ds_judgements_public_ui/templates/includes/info_cards_help_guidance.html @@ -1,30 +1,22 @@

Help and guidance

-
-

Pages in this section

-
+
+

Pages in this section

+
-
- diff --git a/ds_judgements_public_ui/templates/includes/info_cards_judgments_decisions.html b/ds_judgements_public_ui/templates/includes/info_cards_judgments_decisions.html index 01b045269..cd4df779b 100644 --- a/ds_judgements_public_ui/templates/includes/info_cards_judgments_decisions.html +++ b/ds_judgements_public_ui/templates/includes/info_cards_judgments_decisions.html @@ -1,28 +1,20 @@
-
-

You may also be interested in

-
+
+

You may also be interested in

+
-
- diff --git a/ds_judgements_public_ui/templates/includes/info_cards_privacy_policy.html b/ds_judgements_public_ui/templates/includes/info_cards_privacy_policy.html index c0b340c2a..c7bb03846 100644 --- a/ds_judgements_public_ui/templates/includes/info_cards_privacy_policy.html +++ b/ds_judgements_public_ui/templates/includes/info_cards_privacy_policy.html @@ -1,27 +1,19 @@
-
-

You may also be interested in

-
+
+

You may also be interested in

+
-
- diff --git a/ds_judgements_public_ui/templates/includes/info_cards_terms_policies.html b/ds_judgements_public_ui/templates/includes/info_cards_terms_policies.html index 8826e3b3a..6eaf9b19d 100644 --- a/ds_judgements_public_ui/templates/includes/info_cards_terms_policies.html +++ b/ds_judgements_public_ui/templates/includes/info_cards_terms_policies.html @@ -1,28 +1,21 @@

Terms and policies

-
-

Pages in this section

-
+
+

Pages in this section

+
-
- diff --git a/ds_judgements_public_ui/templates/includes/info_cards_terms_use.html b/ds_judgements_public_ui/templates/includes/info_cards_terms_use.html index f0c0614b8..45475f567 100644 --- a/ds_judgements_public_ui/templates/includes/info_cards_terms_use.html +++ b/ds_judgements_public_ui/templates/includes/info_cards_terms_use.html @@ -1,28 +1,20 @@
-
-

You may also be interested in

-
+
+

You may also be interested in

+
-
- From 235e7aaf2d9e09221b9957651bc0f8c0a4c54407 Mon Sep 17 00:00:00 2001 From: Donna-H Date: Fri, 10 Jan 2025 10:27:46 +0000 Subject: [PATCH 4/4] remove landing info --- .../templates/includes/info_cards_help_guidance.html | 8 ++++---- .../templates/includes/info_cards_terms_policies.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ds_judgements_public_ui/templates/includes/info_cards_help_guidance.html b/ds_judgements_public_ui/templates/includes/info_cards_help_guidance.html index c97e64925..bb3e29c2b 100644 --- a/ds_judgements_public_ui/templates/includes/info_cards_help_guidance.html +++ b/ds_judgements_public_ui/templates/includes/info_cards_help_guidance.html @@ -5,17 +5,17 @@

Help and guidance

Pages in this section

-
- +
+

How to search Find Case Law

Learn how this website’s search box works and how to filter results.

- +

Understanding Judgments and decisions

Read an explanation of what judgments are and what they contain.

- +

Contact us

Find out how you can contact the Find Case Law team.

diff --git a/ds_judgements_public_ui/templates/includes/info_cards_terms_policies.html b/ds_judgements_public_ui/templates/includes/info_cards_terms_policies.html index 6eaf9b19d..c08e4c12d 100644 --- a/ds_judgements_public_ui/templates/includes/info_cards_terms_policies.html +++ b/ds_judgements_public_ui/templates/includes/info_cards_terms_policies.html @@ -5,16 +5,16 @@

Pages in this section

-