Merge pull request #116 from 18F/release-v3.0.0

Releasing version 3.0.0
18F · Feb 6, 2018 · 83bd7b9 · 83bd7b9
2 parents f460e79 + 86ce4b3
commit 83bd7b9
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 92 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uswds-jekyll (2.2.1)
+    uswds-jekyll (3.0.0)
       jekyll (~> 3.4)
 
 GEM
@@ -20,7 +20,7 @@ GEM
     http_parser.rb (0.6.0)
     i18n (0.9.3)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.0)
+    jekyll (3.7.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -36,7 +36,7 @@ GEM
     jekyll-last-modified-at (1.0.1)
       jekyll (~> 3.3)
       posix-spawn (~> 0.3.9)
-    jekyll-sass-converter (1.5.1)
+    jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
@@ -55,7 +55,7 @@ GEM
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rouge (3.1.0)
+    rouge (3.1.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     sass (3.5.5)

diff --git a/_sass/uswds/components/_header.scss b/_sass/uswds/components/_header.scss
@@ -102,7 +102,7 @@ $z-index-nav:     9000;
   @include position(fixed, 0);
   background: $color-black;
   opacity: 0;
-  transition: opacity 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
   visibility: hidden;
   z-index: $z-index-overlay;
 

diff --git a/_sass/uswds/components/_sidenav.scss b/_sass/uswds/components/_sidenav.scss
@@ -1,31 +1,8 @@
 
 .usa-sidenav-list {
   @include usa-sidenav-list;
-  border-bottom: 1px solid;
-  border-top: 1px solid;
-
-  @include media($large-screen) {
-    border-bottom: none;
-    border-top: none;
-  }
-
-  .usa-grid & {
-    @include margin(null (-$site-margins-mobile) null (-$site-margins-mobile));
-
-    @include media($medium-screen) {
-      @include margin(null 0);
-    }
-  }
 }
 
 .usa-sidenav-sub_list {
   @include usa-sidenav-sublist;
 }
-
-.usa-layout-docs-sidenav {
-  padding-top: 2.4rem;
-
-  @include media($large-screen) {
-    padding-top: 0;
-  }
-}
diff --git a/_sass/uswds/core/_utilities.scss b/_sass/uswds/core/_utilities.scss
@@ -191,7 +191,7 @@
     display: block;
     font-family: $font-sans;
     line-height: 1.3;
-    padding: 0.85rem 1rem 0.85rem $site-margins-mobile;
+    padding: 0.85rem 1rem 0.85rem 1.8rem;
     text-decoration: none;
 
     &:hover {
@@ -207,10 +207,10 @@
     }
 
     &.usa-current { /* stylelint-disable-line selector-no-qualifying-type */
-      border-left: $sidenav-current-border-width solid $color-primary;
+      border-left: 0.4rem solid $color-primary;
       color: $color-primary;
       font-weight: $font-bold;
-      padding-left: $site-margins-mobile - $sidenav-current-border-width;
+      padding-left: 1.4rem;
     }
   }
 }

diff --git a/_sass/uswds/core/_variables.scss b/_sass/uswds/core/_variables.scss
@@ -128,22 +128,21 @@ $image-path:  '../img' !default;
 $asset-pipeline:      false !default;
 
 // Magic Numbers
-$text-max-width:                66ch !default; // 66 characters per line
-$lead-max-width:                77rem !default;
-$site-max-width:                1040px !default;
-$site-margins:                  3rem !default;
-$site-margins-mobile:           1.5rem !default;
-$article-max-width:             600px !default;
-$input-max-width:               46rem !default;
-$label-border-radius:           2px !default;
-$checkbox-border-radius:        2px !default;
-$border-radius:                 3px !default;
-$button-border-radius:          5px !default;
-$box-shadow:                    0 0 2px $color-shadow !default;
-$focus-outline:                 2px dotted $color-gray-light !default;
-$focus-spacing:                 3px !default;
-$nav-width:                     951px !default;
-$sidenav-current-border-width:  0.4rem !default; // must be in rem for math
+$text-max-width:          66ch !default; // 66 characters per line
+$lead-max-width:          77rem !default;
+$site-max-width:          1040px !default;
+$site-margins:            3rem !default;
+$site-margins-mobile:     1.5rem !default;
+$article-max-width:       600px !default;
+$input-max-width:         46rem !default;
+$label-border-radius:     2px !default;
+$checkbox-border-radius:  2px !default;
+$border-radius:           3px !default;
+$button-border-radius:    5px !default;
+$box-shadow:              0 0 2px $color-shadow !default;
+$focus-outline:           2px dotted $color-gray-light;
+$focus-spacing:           3px;
+$nav-width:               951px !default;
 
 // 44 x 44 pixels hit target following Apple iOS Human Interface
 // Guidelines

diff --git a/_sass/uswds/elements/_inputs.scss b/_sass/uswds/elements/_inputs.scss
@@ -112,9 +112,7 @@ select {
   appearance: none;
   background-color: $color-white;
   background-image: url('#{$image-path}/arrow-both.png');
-  // Ensure browsers that don't support SVG in background-image (IE 11 and below) fall back to PNG. 
-  // See https://www.broken-links.com/2010/06/14/using-svg-in-backgrounds-with-png-fallback/
-  background-image: none, url('#{$image-path}/arrow-both.svg'), url('#{$image-path}/arrow-both.png');
+  background-image: url('#{$image-path}/arrow-both.svg');
   background-position: right 1.3rem center;
   background-repeat: no-repeat;
   background-size: 1rem;

diff --git a/assets/uswds/css/uswds.css b/assets/uswds/css/uswds.css
@@ -1,4 +1,4 @@
-/*! uswds v1.4.4 */
+/*! uswds v1.4.3 */
 html {
   box-sizing: border-box;
 }
@@ -1511,7 +1511,7 @@ select {
   appearance: none;
   background-color: #ffffff;
   background-image: url("../img/arrow-both.png");
-  background-image: none, url("../img/arrow-both.svg"), url("../img/arrow-both.png");
+  background-image: url("../img/arrow-both.svg");
   background-position: right 1.3rem center;
   background-repeat: no-repeat;
   background-size: 1rem;
@@ -3662,7 +3662,7 @@ input.usa-input-medium {
   left: 0;
   background: #000000;
   opacity: 0;
-  transition: opacity 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
   visibility: hidden;
   z-index: 8000;
 }
@@ -4045,7 +4045,7 @@ input.usa-input-medium {
   display: block;
   font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   line-height: 1.3;
-  padding: 0.85rem 1rem 0.85rem 1.5rem;
+  padding: 0.85rem 1rem 0.85rem 1.8rem;
   text-decoration: none;
 }
 
@@ -4066,7 +4066,7 @@ input.usa-input-medium {
   border-left: 0.4rem solid #0071bc;
   color: #0071bc;
   font-weight: 700;
-  padding-left: 1.1rem;
+  padding-left: 1.4rem;
 }
 
 @media screen and (min-width: 951px) {
@@ -4741,8 +4741,6 @@ input[type=search] {
   margin-bottom: 0;
   list-style-type: none;
   padding-left: 0;
-  border-bottom: 1px solid;
-  border-top: 1px solid;
 }
 
 .usa-sidenav-list > li {
@@ -4765,7 +4763,7 @@ input[type=search] {
   display: block;
   font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
   line-height: 1.3;
-  padding: 0.85rem 1rem 0.85rem 1.5rem;
+  padding: 0.85rem 1rem 0.85rem 1.8rem;
   text-decoration: none;
 }
 
@@ -4786,26 +4784,7 @@ input[type=search] {
   border-left: 0.4rem solid #0071bc;
   color: #0071bc;
   font-weight: 700;
-  padding-left: 1.1rem;
-}
-
-@media screen and (min-width: 1201px) {
-  .usa-sidenav-list {
-    border-bottom: none;
-    border-top: none;
-  }
-}
-
-.usa-grid .usa-sidenav-list {
-  margin-right: -1.5rem;
-  margin-left: -1.5rem;
-}
-
-@media screen and (min-width: 600px) {
-  .usa-grid .usa-sidenav-list {
-    margin-right: 0;
-    margin-left: 0;
-  }
+  padding-left: 1.4rem;
 }
 
 .usa-sidenav-sub_list {
@@ -4849,16 +4828,6 @@ input[type=search] {
   padding-left: 3.8rem;
 }
 
-.usa-layout-docs-sidenav {
-  padding-top: 2.4rem;
-}
-
-@media screen and (min-width: 1201px) {
-  .usa-layout-docs-sidenav {
-    padding-top: 0;
-  }
-}
-
 .usa-skipnav {
   background: transparent;
   color: #212121;

diff --git a/assets/uswds/css/uswds.min.css b/assets/uswds/css/uswds.min.css
diff --git a/assets/uswds/css/uswds.min.css.map b/assets/uswds/css/uswds.min.css.map
diff --git a/uswds-jekyll.gemspec b/uswds-jekyll.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'uswds-jekyll'
-  s.version       = '2.2.1'
+  s.version       = '3.0.0'
   s.authors       = ['Shawn Allen', 'Brian Hurst', 'Scott Weber']
   s.email         = ['[email protected]', '[email protected]']