Merge branch 'develop' of https://github.com/OS2web/os2web8 into develop

Author: juuliabellcom

composer.json

@@ -202,6 +202,9 @@
             "drupal/textfield_counter" : {
                 "Fix scrolltop prevent" :  "./patches/textfield_counter-scrolltop-fix.patch"
             },
+            "drupal/easy_breadcrumb" : {
+                "Fix frontpage page as part of the breadcrumb path" :  "./patches/easy-breadcrumb-include-frontpage.patch"
+            },
             "drupal/field_group": {
                 "HTML5 Validation Prevents Submission in Tabs" : "https://www.drupal.org/files/issues/2019-10-04/field_group-HTML5_validation_prevents_submission_in_tabs-2969051-9.patch"
             },

composer.lock

@@ -0,0 +1,13 @@
+diff --git a/src/EasyBreadcrumbBuilder.php b/src/EasyBreadcrumbBuilder.php
+index 91cdf2f..64e8243 100644
+--- a/src/EasyBreadcrumbBuilder.php
++++ b/src/EasyBreadcrumbBuilder.php
+@@ -832,7 +832,7 @@ class EasyBreadcrumbBuilder implements BreadcrumbBuilderInterface {
+ 
+     // Find the system path by resolving aliases, language prefix, etc.
+     $processed = $this->pathProcessor->processInbound($path, $request);
+-    if (empty($processed) || !empty($exclude[$processed])) {
++    if ((empty($processed) || !empty($exclude[$processed])) && $this->config->get(EasyBreadcrumbConstants::INCLUDE_HOME_SEGMENT)) {
+ 
+       // This resolves to the front page, which we already add.
+       return NULL;

patches/easy-breadcrumb-include-frontpage.patch

@@ -80,3 +80,20 @@ function fds_redwhite_theme_preprocess_anonymous_subscriptions_message(array &$v
     $variables['link'] = Link::fromTextAndUrl(t('Klik her for at gå til høringer og afgørelser'), Url::fromUserInput('/hoeringer-og-afgoerelser'));
   }
 }
+
+/**
+ * Implements hook_preprocess_HOOK().
+ */
+function fds_redwhite_theme_preprocess_paragraph(&$variables)
+{
+  /** @var \Drupal\paragraphs\Entity\Paragraph $paragraph */
+  $paragraph = $variables['paragraph'];
+
+  if ($paragraph->bundle() != 'os2web_banner_paragraph') {
+    return;
+  }
+
+  $breadcrumb_manager = Drupal::service('breadcrumb');
+  $route_match = Drupal::service('current_route_match');
+  $variables['breadcrumbs'] = $breadcrumb_manager->build($route_match)->toRenderable();
+}

web/themes/custom/fds_redwhite_theme/dist/javascripts/app.js

@@ -62,6 +62,45 @@ document.addEventListener('DOMContentLoaded', function() {
   }
 });
 
+// Footer menu dropdowns.
+document.addEventListener('DOMContentLoaded', function() {
+  function toggle(event) {
+    var button = event.target;
+    var parent = button.parentNode;
+    var list = parent.querySelector('.menu');
+    if (list) {
+      list.classList.toggle('show');
+      parent.classList.toggle('active');
+    }
+  }
+
+  var buttons = document.querySelectorAll('.footer .block-menu.navigation .menu-item--expanded');
+
+  for (var i = 0; i < buttons.length; i++) {
+    var button = buttons[i];
+
+    button.addEventListener('click', toggle);
+  }
+});
+
+// Cover arrow adjustments.
+document.addEventListener('DOMContentLoaded', function() {
+  var coverArrow = document.querySelector('.rk_cover_arrow_button_wrapper');
+
+  if (coverArrow) {
+    coverArrow.parentNode.setAttribute('style', 'position: relative;');
+    coverArrow.addEventListener('click', scroll);
+  }
+
+  function scroll(event) {
+    var scroll_to = jQuery(event.target)
+
+    jQuery([document.documentElement, document.body]).animate({
+      scrollTop: scroll_to.offset().top - 200
+    }, 1000);
+  }
+});
+
 // Open all file-links in a new window.
 (function() {
   var links = document.querySelectorAll('.field--type-file .file a');

web/themes/custom/fds_redwhite_theme/dist/stylesheets/stylesheet.css

@@ -41,17 +41,6 @@
 
       color: $color-orange-004;
     }
-
-    &:first-child {
-      display: none;
-    }
-
-    &:nth-child(2) {
-
-      &:before {
-        display: none;
-      }
-    }
   }
 
   a {

web/themes/custom/fds_redwhite_theme/fds_redwhite_theme.theme

@@ -89,39 +89,13 @@
   background: linear-gradient(90deg, rgba(0,102,50,1) 0%, rgba(0,102,50,0.75) 50%, rgba(0,102,50,0) 100%);
 }
 
-.path-frontpage {
-
-  &, &.toolbar-fixed {
-    padding-top: 0 !important;
-
-    &:not(.gin--vertical-toolbar) {
-
-      &.toolbar-horizontal {
-        padding-top: 39px !important;
-
-        &.toolbar-tray-open {
-          padding-top: 79px !important;
-        }
-      }
-    }
-  }
-}
-
 body {
-
   &, &.toolbar-fixed {
     padding-top: 74px !important;
+  }
 
-    &:not(.gin--vertical-toolbar) {
-
-      &.toolbar-horizontal {
-        padding-top: 74px + 39px !important;
-
-        &.toolbar-tray-open {
-          padding-top: 74px + 79px !important;
-        }
-      }
-    }
+  &.toolbar-tray-open {
+    padding-top: 79px !important;
   }
 }
 
@@ -158,28 +132,6 @@ body {
   }
 }
 
-.custom-header--fixed {
-  position: fixed;
-
-  top: 0;
-  left: 0;
-  right: 0;
-
-  z-index: 300;
-
-  .toolbar-horizontal:not(.gin--vertical-toolbar) {
-    top: 39px;
-  }
-
-  .toolbar-horizontal.toolbar-tray-open:not(.gin--vertical-toolbar) & {
-    top: 79px; // Height of toolbar tray.
-  }
-
-  .path-frontpage & {
-    display: none;
-  }
-}
-
 .custom-header__button {
   padding: 10px; // For fat thumbs.
 
@@ -462,25 +414,6 @@ body {
 
 // Desktop - and up
 @include media-breakpoint-up(md) {
-
-  body {
-
-    &, &.toolbar-fixed {
-      padding-top: 132px !important; // Height of .custom-header--fixed (recalculated by JS)
-
-      &:not(.gin--vertical-toolbar) {
-
-        &.toolbar-horizontal {
-          padding-top: 132px + 39px !important;
-
-          &.toolbar-tray-open {
-            padding-top: 132px + 79px !important;
-          }
-        }
-      }
-    }
-  }
-
   .custom-header {
 
     .views-exposed-form {

web/themes/custom/fds_redwhite_theme/src/javascripts/app.js

@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme override for a breadcrumb trail.
+ *
+ * Available variables:
+ * - breadcrumb: Breadcrumb trail items.
+ */
+#}
+{% if breadcrumb %}
+  <nav role="navigation" aria-labelledby="system-breadcrumb">
+    <h2 id="system-breadcrumb" class="visually-hidden">{{ 'Breadcrumb'|t }}</h2>
+
+    <ol class="breadcrumb">
+    {% for item in breadcrumb %}
+      <li>
+        {% if item.url %}
+          <a href="{{ item.url }}">{{ item.text }}</a>
+        {% else %}
+          {{ item.text }}
+        {% endif %}
+      </li>    {% endfor %}
+    </ol>
+  </nav>
+{% endif %}