govuk_publishing_components 27.8.1 → 27.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f2aa4a5338ce625693a82792f054575ba77e17f7b59dec7a43375cd69bdc0a0
-  data.tar.gz: b972a36c99f444e03f1190b54dc38c48a4e755779df9b3596331765785a0ea28
+  metadata.gz: 84421d91c40a900cecce84bc40059fc02803fbdb42173e03a590dc2b26904353
+  data.tar.gz: a23db6521a6481c233984680d2eb3c166f07b1ed321e6bf7ec6ca5e0e392b36b
 SHA512:
-  metadata.gz: 7ef57a9ae12333724ca55b5826eb2f962e02c51877e2944b10d7d214258e38aa517317692cc1ee2aab58f38ed7051ebf9fe3ddc864e6982330baf286fe314f9d
-  data.tar.gz: 8548a40fad2185b2a63fd7c7748f1bcee2511dfc0c610fbeb8f50caf7ad0daf6739e04fe0c06bcf9e52536d71e8a35203f22847a83ece3b3517c826eda87a8ae
+  metadata.gz: c4c0ea74bb2365e4bd1ee66768566f96a4655f9dcfc0e369723b79bb8814c3b9e882611c45db1853552a2407ae0ae30f38dd733e27107fdadd120916d410be23
+  data.tar.gz: 49d57ddc1d28d67b450d1e1211195511fb93c87ed05fae9887a58c17a8617e804b8ee497978bc9a03fcb34f6fffe251795158f722e6b63398f489e0e2f1ba449

data/app/assets/javascripts/govuk_publishing_components/components/intervention.js

@@ -8,6 +8,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   Intervention.prototype.init = function () {
     if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
+      // Send a tracking event when this component is shown
       window.GOVUK.analytics.trackEvent('interventionBanner', 'interventionShown')
     }
   }

data/app/assets/javascripts/govuk_publishing_components/components/layout-super-navigation-header.js

@@ -124,25 +124,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
     this.hiddenButtons = this.$module.querySelectorAll('button[hidden]')
 
-    this.lastWindowSize = undefined
+    this.lastWindowSize = null
   }
 
   SuperNavigationMegaMenu.prototype.windowSize = windowSize
 
-  // Resizes the space needed for the dropdown menu so that it doesn't overlap
-  // with the page content. As this is an event that needs to be added and
-  // removed it can't be be bound to `this` because that changes the fingerprint
-  // of the function, and makes it unable to be removed with
-  // `removeEventListener`.
-  SuperNavigationMegaMenu.prototype.resizeHandler = function () {
-    var $module = document.querySelector('[data-module="super-navigation-mega-menu"]')
-    var $openButton = $module.querySelector('[aria-expanded="true"][data-toggle-desktop-group="top"]')
-    var $openMenu = $openButton ? $module.querySelector('#' + $openButton.getAttribute('aria-controls')) : null
-    var margin = $openMenu && windowSize() === 'desktop' ? $openMenu.offsetHeight : 0
-
-    $module.style.marginBottom = margin + 'px'
-  }
-
   SuperNavigationMegaMenu.prototype.updateStates = function () {
     if (this.windowSize() === 'mobile' && this.lastWindowSize !== 'mobile') {
       this.$navigationToggle.removeAttribute('hidden')
@@ -161,8 +147,21 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     if (this.windowSize() === 'desktop' && this.lastWindowSize !== 'desktop') {
       this.$navigationToggle.setAttribute('hidden', 'hidden')
       this.$navigationMenu.removeAttribute('hidden')
+    }
 
-      this.resizeHandler()
+    // The dropdown menu height is only needed when in desktop mode as this is
+    // when the dropdown menu is using `absolute` positioning. This requires
+    // JavaScript to work out the height and make space for the dropdown menu.
+    if (windowSize() === 'desktop') {
+      // Check whether any of the dropdown menus are open.
+      var $openButton = this.$module.querySelector('[aria-expanded="true"][data-toggle-desktop-group="top"]')
+      // Gets the open dropdown menu
+      var $openMenu = $openButton ? this.$module.querySelector('#' + $openButton.getAttribute('aria-controls')) : null
+      // If there is an open dropdown menu, get the height of the dropdown menu.
+      var margin = $openMenu ? $openMenu.offsetHeight : 0
+
+      // Make space for the dropdown menu.
+      this.$module.style.marginBottom = margin + 'px'
     }
 
     this.lastWindowSize = this.windowSize()
@@ -231,30 +230,9 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
     this.lastWindowSize = this.windowSize()
 
-    // The menu needs to be updated when the window is resized - specifically,
-    // the top level navigation toggle needs to be shown or hidden.
-    //     Using `matchMedia` to listen for both resize events means that this
-    // will only fire when the media query is matched so is more efficient. The
-    // fallback is the `window.resize` event with a check to make sure that it
-    // only does things when moving from mobile to desktop view.
-    var setupResizeListener = function () {
-      window.addEventListener('resize', this.updateStates.bind(this), { passive: true })
-    }.bind(this)
-
-    if (typeof window.matchMedia === 'function') {
-      // Internet Explorer 11 supports `matchMedia`, but doesn't support
-      // the `change` event[1] - so we try it, and then fail back to using
-      // `window.resize`.
-      // [1]: https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryList/onchange
-      try {
-        window.matchMedia('screen and (min-width:' + SETTINGS.breakpoint.desktop + 'px)')
-          .addEventListener('change', this.updateStates.bind(this))
-      } catch (error) {
-        setupResizeListener()
-      }
-    } else {
-      setupResizeListener()
-    }
+    // The menu needs to be updated when the window is resized to make sure that
+    // the space needed for the dropdown menu is correct.
+    window.addEventListener('resize', this.updateStates.bind(this), { passive: true })
   }
 
   Modules.SuperNavigationMegaMenu = SuperNavigationMegaMenu

data/app/assets/stylesheets/govuk_publishing_components/components/_intervention.scss

@@ -1,18 +1,21 @@
 .gem-c-intervention {
   @include govuk-text-colour;
-  @include govuk-responsive-padding(6, "left");
-  @include govuk-responsive-padding(6, "right");
-  @include govuk-responsive-padding(4, "top");
-  @include govuk-responsive-padding(4, "bottom");
+  @include govuk-responsive-padding(3);
   @include govuk-responsive-margin(6, "bottom");
   background-color: govuk-colour("light-grey", $legacy: "grey-4");
-
-  .gem-c-intervention__title {
-    @include govuk-responsive-margin(0);
-    @include govuk-responsive-padding(4, "bottom");
-  }
+  border-left: 10px solid $govuk-success-colour;
 
   .govuk-body:last-of-type {
-    @include govuk-responsive-margin(0, "bottom");
+    margin-bottom: 0;
   }
 }
+
+.gem-c-intervention__textwrapper {
+  display: block;
+}
+
+.gem-c-intervention__dismiss-icon {
+  width: 1em;
+  height: 1em;
+  margin-bottom: -2px;
+}

data/app/assets/stylesheets/govuk_publishing_components/components/_layout-for-public.scss

@@ -52,15 +52,3 @@ $current-indicator-width: 4px;
     color: $govuk-link-colour;
   }
 }
-
-.gem-c-layout-for-public-account-feedback-footer {
-  margin-bottom: govuk-spacing(4);
-  padding: govuk-spacing(3);
-  background: govuk-colour("light-grey");
-
-  @include govuk-media-query($from: tablet) {
-    padding: govuk-spacing(6);
-    margin-top: govuk-spacing(2);
-    margin-bottom: govuk-spacing(8);
-  }
-}