From b3a263f64f4ea1c21fdd6f8350faa1d2a0bb9151 Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Mon, 26 Aug 2024 12:10:40 +0100 Subject: [PATCH 1/4] adds variables for heading colours for footer regions --- css/base/variables.css | 3 +++ css/components/footer.css | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/css/base/variables.css b/css/base/variables.css index 63e4dd92..6b090441 100644 --- a/css/base/variables.css +++ b/css/base/variables.css @@ -201,10 +201,13 @@ body { --section-spacing-vertical-pre-footer: var(--spacing-largest); --section-spacing-vertical-footer: var(--spacing); --section-spacing-vertical-post-footer: var(--spacing); + --color-pre-footer-heading: var(--color-white); --color-pre-footer-link: var(--color-white); --color-pre-footer-text: var(--color-white); + --color-footer-heading: var(--color-text); --color-footer-link: var(--color-link); --color-footer-text: var(--color-text); + --color-post-footer-heading: var(--color-text); --color-post-footer-link: var(--color-link); --color-post-footer-text: var(--color-text); diff --git a/css/components/footer.css b/css/components/footer.css index b4c5e9f3..73e736d1 100644 --- a/css/components/footer.css +++ b/css/components/footer.css @@ -34,3 +34,26 @@ .lgd-footer__post-footer a { color: var(--color-post-footer-link); } + +/* Headings in footer regions */ +.lgd-footer__pre-footer h2, +.lgd-footer__pre-footer h3, +.lgd-footer__pre-footer h4, +.lgd-footer__pre-footer h5, +.lgd-footer__pre-footer h6 { + color: var(--color-pre-footer-heading); +} +.lgd-footer__footer h2, +.lgd-footer__footer h3, +.lgd-footer__footer h4, +.lgd-footer__footer h5, +.lgd-footer__footer h6 { + color: var(--color-footer-heading); +} +.lgd-footer__post-footer h2, +.lgd-footer__post-footer h3, +.lgd-footer__post-footer h4, +.lgd-footer__post-footer h5, +.lgd-footer__post-footer h6 { + color: var(--color-post-footer-heading); +} From 9f88140727cbc99bea18083046459d6fd3dc3d7d Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Tue, 15 Oct 2024 11:36:05 +0100 Subject: [PATCH 2/4] Uses logical properties for fields.css file --- css/base/fields.css | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/css/base/fields.css b/css/base/fields.css index aa0795ff..1f9d2b68 100644 --- a/css/base/fields.css +++ b/css/base/fields.css @@ -6,17 +6,14 @@ .field__label { font-weight: var(--heading-font-weight); } -.field--label-inline .field__label, -.field--label-inline .field__items { - float: left; /* LTR */ + +.field--label-inline > .field__label, +.field--label-inline > .field__items { + float: left; } + .field--label-inline .field__label, .field--label-inline > .field__item, .field--label-inline .field__items { - padding-right: var(--spacing-smaller); -} -[dir="rtl"] .field--label-inline .field__label, -[dir="rtl"] .field--label-inline .field__items { - padding-right: 0; - padding-left: var(--spacing-smaller); + padding-block-end: var(--spacing-smaller); } From 7263f37654853b4459209da9d92e6221a43e6630 Mon Sep 17 00:00:00 2001 From: Mark Conroy Date: Tue, 15 Oct 2024 12:56:17 +0100 Subject: [PATCH 3/4] fixes typo --- css/base/fields.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/base/fields.css b/css/base/fields.css index 1f9d2b68..da6fec3f 100644 --- a/css/base/fields.css +++ b/css/base/fields.css @@ -15,5 +15,5 @@ .field--label-inline .field__label, .field--label-inline > .field__item, .field--label-inline .field__items { - padding-block-end: var(--spacing-smaller); + padding-inline-end: var(--spacing-smaller); } From f9c84231a10352714507ba50a3c1747fa144e850 Mon Sep 17 00:00:00 2001 From: Rupert Jabelman Date: Tue, 22 Oct 2024 10:33:53 +0100 Subject: [PATCH 4/4] Removed URL fragment from template and moved it to a guides specific preprocess, so it only appears on guides. --- localgov_base.theme | 13 +++++++++++++ templates/_components/prev-next.twig | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/localgov_base.theme b/localgov_base.theme index f5106ce7..006ff6e5 100644 --- a/localgov_base.theme +++ b/localgov_base.theme @@ -8,6 +8,7 @@ use Drupal\Component\Utility\Crypt; use Drupal\Component\Utility\DeprecationHelper; use Drupal\Core\Form\FormStateInterface; +use Drupal\Core\Url; use Drupal\views\ViewExecutable; /** @@ -248,3 +249,15 @@ function localgov_base_preprocess_container(&$variables) { function localgov_base_form_preview_link_entity_form_alter(&$form, $form_state, $form_id) { $form['#attached']['library'][''] = 'localgov_base/preview-link'; } + +/** + * Implements hook_preprocess_guides_prev_next_block(). + */ +function localgov_base_preprocess_guides_prev_next_block(&$variables) { + if ($variables['previous_url'] instanceof Url) { + $variables['previous_url']->setOption('fragment', 'lgd-guides__title'); + } + if ($variables['next_url'] instanceof Url) { + $variables['next_url']->setOption('fragment', 'lgd-guides__title'); + } +} diff --git a/templates/_components/prev-next.twig b/templates/_components/prev-next.twig index 3f3f90a4..ea1954e3 100644 --- a/templates/_components/prev-next.twig +++ b/templates/_components/prev-next.twig @@ -25,7 +25,7 @@