hmrc-frontend 6.103.0 → 6.104.0

package/govuk-prototype-kit.config.json

@@ -24,10 +24,10 @@
   "scripts": [
     "/hmrc/all.js",
     "/hmrc/init-all.js",
-    "/hmrc/accessible-autocomplete-6.103.0.js"
+    "/hmrc/accessible-autocomplete-6.104.0.js"
   ],
   "stylesheets": [
-    "/hmrc/accessible-autocomplete-6.103.0.css"
+    "/hmrc/accessible-autocomplete-6.104.0.css"
   ],
   "importNunjucksMacrosInto": [
     "/hmrc/templates/account-header.html"

package/hmrc/VERSION.txt

@@ -1 +1 @@
-6.103.0
+6.104.0

package/hmrc/{accessible-autocomplete-6.103.0.css → accessible-autocomplete-6.104.0.css}

@@ -1,2 +1,2 @@
 .autocomplete__wrapper{position:relative}.autocomplete__hint,.autocomplete__input{-webkit-appearance:none;-moz-appearance:none;appearance:none;border:2px solid #0b0c0c;border-radius:0;-webkit-box-sizing:border-box;box-sizing:border-box;height:2.5rem;line-height:1.25;margin-bottom:0;width:100%}.autocomplete__input{background-color:transparent;position:relative}.autocomplete__hint{color:#505a5f;position:absolute}.autocomplete__input--default{padding:5px}.autocomplete__input--focused{-webkit-box-shadow:inset 0 0 0 2px;box-shadow:inset 0 0 0 2px;outline:3px solid #fd0;outline-offset:0}.autocomplete__input--show-all-values{cursor:pointer;padding:5px 35px 5px 5px}.autocomplete__dropdown-arrow-down{display:inline-block;height:24px;position:absolute;right:8px;top:10px;width:24px;z-index:-1}.autocomplete__menu{background-color:#fff;border:2px solid #0b0c0c;border-top:0;color:#0b0c0c;margin:0;max-height:342px;overflow-x:hidden;padding:0;width:100%;width:calc(100% - 4px)}.autocomplete__menu--visible{display:block}.autocomplete__menu--hidden{display:none}.autocomplete__menu--overlay{-webkit-box-shadow:0 2px 6px rgba(0,0,0,.257);box-shadow:0 2px 6px rgba(0,0,0,.257);left:0;position:absolute;top:100%;z-index:100}.autocomplete__menu--inline{position:relative}.autocomplete__option{border-bottom:1px solid #b1b4b6;border-left-width:0;border-right-width:0;border-top-width:1px;cursor:pointer;display:block;position:relative}.autocomplete__option>*{pointer-events:none}.autocomplete__option:first-of-type{border-top-width:0}.autocomplete__option:last-of-type{border-bottom-width:0}.autocomplete__option--odd{background-color:#f3f2f1}.autocomplete__option--focused,.autocomplete__option:hover{background-color:#1d70b8;border-color:#1d70b8;color:#fff;outline:none}@media (-ms-high-contrast:active),(forced-colors:active){.autocomplete__menu{border-color:FieldText}.autocomplete__option{background-color:Field;color:FieldText}.autocomplete__option--focused,.autocomplete__option:hover{background-color:Highlight;background-color:SelectedItem;border-color:SelectedItem;color:HighlightText;color:SelectedItemText;forced-color-adjust:none;outline-color:SelectedItemText}}.autocomplete__option--no-results{background-color:#f3f2f1;color:#505a5f;cursor:not-allowed}.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:1rem;font-weight:400}.autocomplete__hint,.autocomplete__option{padding:5px}@media (min-width:641px){.autocomplete__hint,.autocomplete__input,.autocomplete__option{font-size:1.1875rem;line-height:1.3157894737}}.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-family:GDS Transport,arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:1rem;font-weight:400;line-height:1.25}@media print{.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-family:sans-serif}}@media (min-width:40.0625em){.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-size:1.1875rem;line-height:1.3157894737}}@media print{.autocomplete__hint,.autocomplete__input,.autocomplete__option,.autocomplete__wrapper{font-size:14pt;line-height:1.15}}.govuk-form-group--error div:has(+.govuk-select--error[data-module=hmrc-accessible-autocomplete])>.autocomplete__wrapper .autocomplete__input{border-color:#d4351c}.autocomplete__dropdown-arrow-down{pointer-events:none;z-index:0}
-/*# sourceMappingURL=maps/accessible-autocomplete-6.103.0.css.map */
+/*# sourceMappingURL=maps/accessible-autocomplete-6.104.0.css.map */

package/hmrc/components/header/_header.scss

@@ -12,30 +12,18 @@ $govuk-header-link-underline-thickness: 3px;
 
   .hmrc-sign-out-nav {
     float: right;
+    margin-bottom: 10px;
 
     .govuk-template--rebranded & {
-      @include govuk-media-query($from: desktop) {
-        padding-top: govuk-spacing(3) + 3px; // makes the baseline match gov.uk logo and service name
-      }
-    }
-  }
-
-  .govuk-header__navigation + .hmrc-sign-out-nav {
-    .govuk-template--rebranded & {
-      padding-top: 0;
-      padding-bottom: govuk-spacing(2);
+      margin-bottom: 15px;
     }
   }
 
   .hmrc-sign-out-nav__link {
     color: govuk-colour("white");
     font-weight: bold;
-    line-height: 1.64285;
     text-decoration: none;
-
-    @include govuk-media-query($from: desktop) {
-      line-height: 2.375;
-    }
+    margin-left: 10px;
 
     &:hover {
       text-decoration: underline;
@@ -169,3 +157,59 @@ $govuk-header-link-underline-thickness: 3px;
 .govuk-template--rebranded .hmrc-header + .hmrc-user-research-banner {
   top: 0;
 }
+
+// Notes on the patches below:
+//
+// use of :has() and :not() is ok because these
+// issues aren't going to be a problem forever
+// because people are migrating to use service
+// navigation to display their service name and
+// navigation items
+
+// the following block of styles makes sure
+// that a service name which spans multiple
+// lines won't cause the sign out link to be
+// displayed under the service name but will
+// be aligned with baseline of its last line
+
+.hmrc-header:has(.hmrc-sign-out-nav):not(:has(.govuk-header__navigation)) {
+  .govuk-header__content {
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: last baseline;
+        -ms-flex-align: last baseline;
+            align-items: last baseline;
+  }
+
+  .hmrc-sign-out-nav {
+    -ms-flex-negative: 0;
+        flex-shrink: 0;
+    margin-left: auto;
+  }
+}
+
+.hmrc-header:has(.govuk-header__navigation) .hmrc-sign-out-nav {
+  margin-top: 4px;
+
+  @include govuk-media-query($from: tablet) {
+    margin-top: 10px;
+  }
+
+  @include govuk-media-query($from: desktop) {
+    margin-top: 0;
+  }
+}
+
+// the following stops the menu button from sitting
+// immediately to right of service name on smallest
+// screens which looks bad and might be an a11y
+// issue in terms of mobile touch target sizing.
+
+.hmrc-header:has(.govuk-header__navigation) {
+  .govuk-header__service-name {
+    @include govuk-media-query($until: mobile) {
+      float: none;
+    }
+  }
+}