Merge pull request #643 from localgovdrupal/1.x

1.7.2 release
localgovdrupal · Oct 30, 2024 · a7f7c21 · a7f7c21
2 parents a6a2b43 + 1fe3800
commit a7f7c21
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 11 deletions.
diff --git 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-inline-end: var(--spacing-smaller);
 }
diff --git 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
@@ -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);
+}
diff --git 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
@@ -25,7 +25,7 @@
   <ul class="lgd-prev-next__list">
     {% if previous_url %}
       <li class="lgd-prev-next__list-item lgd-prev-next__list-item--prev">
-        <a href="{{ previous_url }}#lgd-guides__title" class="lgd-prev-next__link lgd-prev-next__link--prev" aria-label="{{ previous_aria_label }}">
+        <a href="{{ previous_url }}" class="lgd-prev-next__link lgd-prev-next__link--prev" aria-label="{{ previous_aria_label }}">
           {% include "@localgov_base/includes/icons/icon.html.twig" with {
             icon_name: previous_icon,
             icon_classes: 'lgd-prev-next__icon lgd-prev-next__icon--prev',
@@ -44,7 +44,7 @@
     {% endif %}
     {% if next_url %}
       <li class="lgd-prev-next__list-item lgd-prev-next__list-item--next">
-        <a href="{{ next_url }}#lgd-guides__title" class="lgd-prev-next__link lgd-prev-next__link--next" aria-label="{{ next_aria_label }}">
+        <a href="{{ next_url }}" class="lgd-prev-next__link lgd-prev-next__link--next" aria-label="{{ next_aria_label }}">
           <div class="lgd-prev-next__label">
             {{ 'Next'|t }}
           </div>