uswds-rails 1.4.0 → 1.4.1

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

@@ -28,8 +28,7 @@ $z-index-nav:     9000;
     @include media($nav-width) {
       float: right;
       margin-bottom: 0;
-      max-width: 23.5rem;
-      width: 21.5rem;
+      max-width: 21.5rem;
     }
   }
 }
@@ -121,7 +120,7 @@ $z-index-nav:     9000;
 .usa-header-basic {
   .usa-logo {
     @include media($nav-width) {
-      bottom: -4rem;
+      bottom: 0;
       position: absolute;
     }
   }
@@ -178,7 +177,7 @@ $z-index-nav:     9000;
   .usa-nav-inner {
     @include media($nav-width) {
       @include outer-container();
-      @include padding(null $site-margins null 2rem);
+      @include padding(null $site-margins null 1.5rem);
       margin-top: -1px;
       max-width: $site-max-width;
       position: relative;
@@ -194,7 +193,7 @@ $z-index-nav:     9000;
       &[aria-expanded=false],
       &[aria-expanded=true] { /* stylelint-disable-line selector-no-qualifying-type */
         @include media($nav-width) { /* stylelint-disable-line selector-no-qualifying-type */
-          background-position: right 1.5rem top 50%;
+          background-position: right 1.5rem top 53%;
         }
       }
     }
@@ -202,7 +201,7 @@ $z-index-nav:     9000;
 
   .usa-nav-link {
     @include media($nav-width) {
-      padding-top: 1.9rem;
+      @include padding(1.8rem null);
     }
   }
 

data/vendor/assets/stylesheets/uswds/components/_navigation.scss

@@ -1,40 +1,42 @@
 // Header navigation ------------- //
 
 @mixin nav-border {
+  border-bottom: 0.4rem solid $color-primary;
+  padding-bottom: 0.6rem;
+}
+
+@mixin nav-border-thick {
   border-bottom: 0.7rem solid $color-primary;
-  padding-bottom: 1rem;
+  padding-bottom: 0.9rem;
 }
 
 .usa-navbar {
-  border-bottom: 1px solid $color-gray-lighter;
+  border-bottom: 1px solid $color-gray-light;
   height: 4rem;
 
   @include media($nav-width) {
     border-bottom: none;
     display: inline-block;
+    height: 7.8rem; // XXX magic number
   }
 }
 
 .usa-nav-link {
   @include font-smoothing;
 
-  &:focus {
-    outline-offset: 0;
-  }
-
-  &.usa-accordion-button {
-    @include media($nav-width) {
-      span {
-        margin-right: -2rem;
-        padding-right: 2rem;
+  &:hover {
+    span {
+      @include media($nav-width) {
+        @include nav-border;
       }
     }
   }
 
-  &:hover {
+  &.usa-accordion-button {
     span {
       @include media($nav-width) {
-        @include nav-border;
+        margin-right: 0;
+        padding-right: 1.5rem;
       }
     }
   }
@@ -54,7 +56,7 @@
   @include position(fixed, 0 0 0 auto);
 
   background: $color-white;
-  border-left: 1px solid $color-gray-lighter;
+  border-left: 1px solid $color-gray-light;
   border-right: 0;
   display: flex;
   flex-direction: column;
@@ -64,40 +66,20 @@
   width: $sliding-panel-width;
   z-index: $z-index-nav;
 
-  // Defaulting to hidden is very important for ensuring
-  // that the nav contents aren't in the tab order if
-  // the nav menu is off-screen.
-  visibility: hidden;
-
   @include media($nav-width) {
-    @include padding(5rem 0 0 null);
-    background: transparent;
+    @include padding(4.5rem 0 0 null);
     border-left: none;
     display: block;
     float: right;
     overflow-y: visible;
-    padding-left: 0;
     position: relative;
     transform: translateX(0);
     width: auto;
-    visibility: visible;
   }
 
   &.is-visible {
-    // It's very important that we scope the transition to
-    // only include 'transform' here; we used to transition
-    // on 'all', but this prevented the close button from
-    // being focused after activating the nav menu, as the
-    // button wasn't yet visible due to 'visibility'
-    // implicitly being part of the CSS transition.
     transform: translateX(0);
-    transition: transform 0.3s ease-in-out;
-
-    visibility: visible;
-  }
-
-  a:focus {
-    outline-offset: 0;
+    transition: all 0.3s ease-in-out;
   }
 
   nav {
@@ -114,6 +96,10 @@
     color: $color-primary;
     font-weight: $font-bold;
     padding-left: 1.4rem;
+
+    @include media($nav-width) {
+      color: $color-base;
+    }
   }
 
   .usa-button {
@@ -122,7 +108,8 @@
 
   .usa-search {
     @include media($nav-width) {
-      margin-left: 1.8rem; // XXX magic number
+      margin-left: 1.5rem; // XXX magic number
+      top: 4px;
     }
   }
 }
@@ -153,11 +140,11 @@
 
     > a {
       @include media($nav-width) {
-        @include padding(1.3rem 1.5rem 1.7rem 1.5rem);
+        @include padding(1.3rem 1.5rem 2.2rem 1.5rem);
         color: $color-gray;
         font-size: $h5-font-size;
         font-weight: $font-bold;
-        line-height: 1.2;
+        line-height: 1;
       }
 
       &:hover {
@@ -168,27 +155,48 @@
     }
   }
 
+  a {
+    @include media($nav-width) {
+      @include padding(0.75rem null);
+    }
+
+    &:hover {
+      @include media($nav-width) {
+        // color: $color-base;
+      }
+    }
+  }
+
   button {
-    $button-vertical-offset: 44%;
+    $button-vertical-offset: 40%;
 
     @include button-unstyled;
     @include font-smoothing;
     font-weight: $font-normal;
-    padding: 1.4rem 1.5rem 1rem 1.8rem;
+    line-height: 1.3;
+    padding: 0.85rem 1.5rem 0.85rem 1.8rem;
 
     @include media($nav-width) {
-      @include padding(null 3.5rem 1.9rem 1.5rem);
+      @include padding(1.3rem 1.5rem 2.2rem 1.5rem);
       color: $color-gray;
       font-size: $h5-font-size;
       font-weight: $font-bold;
+      line-height: 1;
       width: initial;
     }
 
+    &:focus,
+    &:active {
+      box-shadow: $focus-outline;
+    }
+
     &:hover {
+      background-color: $color-gray-lightest;
       color: $color-primary;
 
       @include media($nav-width) {
         background-color: transparent;
+        // color: $color-base;
       }
     }
 
@@ -203,8 +211,10 @@
         background-image: url('#{$image-path}/angle-arrow-down.png');
         background-image: url('#{$image-path}/angle-arrow-down.svg');
         background-position: right 1.5rem top $button-vertical-offset;
+      }
 
-        &:hover {
+      &:hover {
+        @include media($nav-width) {
           background-image: url('#{$image-path}/angle-arrow-down-primary.png');
           background-image: url('#{$image-path}/angle-arrow-down-primary.svg');
         }
@@ -231,19 +241,60 @@
 
         span {
           @include nav-border;
+          color: $color-white;
         }
       }
     }
   }
 
   @include media($nav-width) {
-    a.usa-current { // stylelint-disable-line selector-no-qualifying-type
+    a.usa-current,
+    .usa-current { // stylelint-disable-line selector-no-qualifying-type
       // undo the sidenav style
       border-left: 0;
       padding-left: 1.5rem;
 
+      &:hover {
+        span {
+          color: $color-primary;
+        }
+      }
+
       span {
         @include nav-border;
+        color: $color-base;
+      }
+    }
+  }
+}
+
+// Extended header navigation ------- //
+
+.usa-header-extended {
+  .usa-nav-link {
+    &:hover {
+      span {
+        @include media($nav-width) {
+          @include nav-border-thick;
+        }
+      }
+    }
+  }
+
+  .usa-nav-primary {
+    button[aria-expanded=true] { /* stylelint-disable-line selector-no-qualifying-type */
+      span {
+        @include media($nav-width) {
+          @include nav-border-thick;
+        }
+      }
+    }
+
+    .usa-current {
+      @include media($nav-width) {
+        span {
+          @include nav-border-thick;
+        }
       }
     }
   }
@@ -262,29 +313,28 @@
     @include margin(3rem null);
 
     @include media($nav-width) {
-      @include margin(-0.2rem null 0 0);
+      @include margin(-0.9rem null 0 0);
       float: left;
-      width: 21.5rem;
     }
   }
 }
 
 .usa-nav-secondary-links {
   @include media($nav-width) {
-    float: right;
+    float: left;
   }
 
   li {
     @include media($nav-width) {
       display: inline;
-      padding-left: 1rem;
+      padding-left: 0.5rem;
     }
 
     &:not(:last-child)::after {
       @include media($nav-width) {
         color: $color-gray-lighter;
         content: '|';
-        padding-left: 1rem;
+        padding-left: 0.5rem;
       }
     }
   }
@@ -307,10 +357,11 @@
     display: none;
 
     @include media($nav-width) {
-      background-image: url('#{$image-path}/search-primary.png');
-      background-image: url('#{$image-path}/search-primary.svg');
+      background-image: url('#{$image-path}/search-alt.png');
+      background-image: url('#{$image-path}/search-alt.svg');
       background-repeat: no-repeat;
       background-position: left center;
+      background-size: 2.2rem;
       display: inline-block;
       padding-left: 2.3rem;
     }
@@ -334,15 +385,13 @@
 // Navigation submenu (dropdown and mega menu) ----- //
 
 .usa-nav-submenu {
-  // @include usa-sidenav-sublist;
-  padding-left: 1rem;
+  @include usa-sidenav-sublist;
 
   @include media($nav-width) {
     @include unstyled-list;
-    @include padding(1.15rem null);
+    @include padding(0.75rem null 0.9rem null);
     background-color: $color-primary-darkest;
-    min-width: 21.5rem;
-    width: auto;
+    width: 21.5rem;
     position: absolute;
   }
 
@@ -360,6 +409,7 @@
       @include media($nav-width) {
         background-color: $color-primary-darkest;
         color: $color-white;
+        padding-left: 1.5rem;
         text-decoration: underline;
       }
     }
@@ -376,18 +426,8 @@
 
   li {
     font-size: $h5-font-size;
-    list-style: none;
     margin-bottom: 0;
   }
-
-  .usa-width-one-fourth {
-    margin-right: 0;
-    width: 100%;
-
-    @include media($nav-width) {
-      @include span-columns(3);
-    }
-  }
 }
 
 // Navigation close button -------- //
@@ -427,10 +467,11 @@
 
 .usa-megamenu {
   @include media($nav-width) {
-    @include padding(2.15rem null); // XXX magic number
+    @include padding(3.15rem null); // XXX magic number
     // XXX this is the difference between the 2rem padding-left
     // of .usa-nav-inner and the $site-margins (3rem) padding-left
     // of .usa-megamenu
+    left: -1rem;
     width: 100%;
   }
 
@@ -465,7 +506,7 @@
     @include media($nav-width) {
       display: block;
       float: right;
-      margin-top: -4.8rem;
+      margin-top: -3.8rem;
     }
   }