dxw_govuk_frontend_rails 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61748f1e13e72d91ec0f332ab57f1aed6576a0aefd522c7c302778a8618f74e5
-  data.tar.gz: 2ba98295582b3a676de197ee93e0625542579925020a169c672802eee641be52
+  metadata.gz: 4d4acfd39c6602f72f50fd8e2747ac3f99708422eb74c9083f968d05d735135d
+  data.tar.gz: 8696f9c16710bedbe45ceef93cebcfce11579a42a30ffb5cabc39e00f6d7f78b
 SHA512:
-  metadata.gz: 9b59f87fef5d49b8519d8bf8f6fbd4899b8fb4c602fbe7ebf4a934f73e70e0addb429edc341c66ce94734716bee9637a70be02bb05be5f3d4b23407294d6bb97
-  data.tar.gz: 362e8387f34f0995a5d7bb00d03fcb0fb2f8a71f03219ae9b42df429cfd9a1e19a6ebdfae9e337a7d7dd6e3b7a1b33f94b75d3057d08535aa761dc601136218d
+  metadata.gz: 79005a142ab72a650b9a8259faa9106c7e0aeda3ae180df70ced6732ff4d794ce23effd8e85f89d7f3c9a2880b347b04e006507b91cfa3626836a1bddaa77103
+  data.tar.gz: 74ab6084a3189937c9825bceeb4a9ddf0c94603a32579733f396bbc9cb8061d24bb4e009c431d294afd08c15612918bd370841a1181c9020cb5e2ddd602ebcaf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dxw_govuk_frontend_rails (3.2.0)
+    dxw_govuk_frontend_rails (3.3.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/dxw_govuk_frontend_rails/version.rb

@@ -1,3 +1,3 @@
 module DxwGovukFrontendRails
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

data/package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "govuk-frontend": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.2.0.tgz",
-      "integrity": "sha512-OtJozAGMEKFu195fNVVrQHUX7+znCkA4cXDKs4lgFlRQOTzN1ogT9010GBARuoTwbeL0VqQ8nerZYjVxH/wafA=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.3.0.tgz",
+      "integrity": "sha512-ncOGTAV6mzz1CPBlr/UGETiG3IO6P3b0CvSI0wxBz7Uo0A/6jttLoxkvuYXju2oNA2yqRh2NjD1zJUOP3Q32CQ=="
     }
   }
 }

data/package.json

@@ -7,7 +7,7 @@
     "lib": "lib"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "npx node-sass ./vendor/assets/stylesheets/govuk-frontend-rails.scss /tmp/govuk-frontend-rails.css"
   },
   "repository": {
     "type": "git",
@@ -21,6 +21,6 @@
   },
   "homepage": "https://github.com/mec/dxw_govuk_frontend_rails#readme",
   "dependencies": {
-    "govuk-frontend": "3.2.0"
+    "govuk-frontend": "3.3.0"
   }
 }

data/vendor/assets/javascripts/govuk_frontend_rails.js

@@ -1873,7 +1873,9 @@ ErrorSummary.prototype.getFragmentFromUrl = function (url) {
  *
  * Returns the first element that exists from this list:
  *
- * - The `<legend>` associated with the closest `<fieldset>` ancestor
+ * - The `<legend>` associated with the closest `<fieldset>` ancestor, as long
+ *   as the top of it is no more than half a viewport height away from the
+ *   bottom of the input
  * - The first `<label>` that is associated with the input using for="inputId"
  * - The closest parent `<label>`
  *
@@ -1888,7 +1890,32 @@ ErrorSummary.prototype.getAssociatedLegendOrLabel = function ($input) {
     var legends = $fieldset.getElementsByTagName('legend');
 
     if (legends.length) {
-      return legends[0]
+      var $candidateLegend = legends[0];
+
+      // If the input type is radio or checkbox, always use the legend if there
+      // is one.
+      if ($input.type === 'checkbox' || $input.type === 'radio') {
+        return $candidateLegend
+      }
+
+      // For other input types, only scroll to the fieldset’s legend (instead of
+      // the label associated with the input) if the input would end up in the
+      // top half of the screen.
+      //
+      // This should avoid situations where the input either ends up off the
+      // screen, or obscured by a software keyboard.
+      var legendTop = $candidateLegend.getBoundingClientRect().top;
+      var inputRect = $input.getBoundingClientRect();
+
+      // If the browser doesn't support Element.getBoundingClientRect().height
+      // or window.innerHeight (like IE8), bail and just link to the label.
+      if (inputRect.height && window.innerHeight) {
+        var inputBottom = inputRect.top + inputRect.height;
+
+        if (inputBottom - legendTop < window.innerHeight / 2) {
+          return $candidateLegend
+        }
+      }
     }
   }
 

data/vendor/assets/stylesheets/components/header/_header.scss

@@ -42,6 +42,7 @@
   }
 
   .govuk-header__logotype {
+    display: inline-block;
     margin-right: govuk-spacing(1);
   }
 

data/vendor/assets/stylesheets/components/input/_input.scss

@@ -13,6 +13,9 @@
     box-sizing: border-box;
     width: 100%;
     height: 40px;
+    @if $govuk-typography-use-rem {
+      height: govuk-px-to-rem(40px);
+    }
     margin-top: 0;
 
     padding: govuk-spacing(1);

data/vendor/assets/stylesheets/components/select/_select.scss

@@ -13,6 +13,9 @@
     box-sizing: border-box; // should this be global?
     max-width: 100%;
     height: 40px;
+    @if $govuk-typography-use-rem {
+      height: govuk-px-to-rem(40px);
+    }
     padding: govuk-spacing(1); // was 5px 4px 4px - size of it should be adjusted to match other form elements
     border: $govuk-border-width-form-element solid $govuk-input-border-colour;
 

data/vendor/assets/stylesheets/components/warning-text/_warning-text.scss

@@ -5,9 +5,6 @@
 @include govuk-exports("govuk/component/warning-text") {
 
   .govuk-warning-text {
-    @include govuk-font($size: 19);
-    @include govuk-text-colour;
-
     position: relative;
     @include govuk-responsive-margin(6, "bottom");
     padding: govuk-spacing(2) 0;
@@ -23,13 +20,15 @@
     display: inline-block;
 
     position: absolute;
-    top: 50%;
     left: 0;
 
-    min-width: 32px;
+    min-width: 29px;
     min-height: 29px;
-    margin-top: -20px; // Half the height of the circle (adjusted for NTA)
-    padding-top: 3px;
+    margin-top: -7px;
+
+    @include govuk-media-query($from: tablet) {
+      margin-top: -5px;
+    }
 
     // When a user customises their colours the background colour will often be removed.
     // Adding a border to the component keeps it's shape as a circle.
@@ -39,7 +38,7 @@
     color: govuk-colour("white");
     background: govuk-colour("black");
 
-    font-size: 1.6em;
+    font-size: 30px;
     line-height: 29px;
 
     text-align: center;
@@ -53,7 +52,9 @@
   }
 
   .govuk-warning-text__text {
+    @include govuk-font($size: 19, $weight: bold);
+    @include govuk-text-colour;
     display: block;
-    padding-left: 50px;
+    padding-left: 45px;
   }
 }

data/vendor/assets/stylesheets/overrides/_display.scss

@@ -15,4 +15,8 @@
   .govuk-\!-display-block {
     display: block !important;
   }
+
+  .govuk-\!-display-none {
+    display: none !important;
+  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dxw_govuk_frontend_rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - mec