Revert "Updates for latest DataTables sort files (#431)" (#434)

This reverts commit e780fe1.

Author: kengdoj

.gitignore

@@ -4,17 +4,3 @@ _site
 node_modules
 .bundle
 .jekyll-cache/
-
-## Assets
-assets/uswds/*
-!assets/uswds/.gitkeep
-assets/js/uswds*
-assets/video-js
-assets/youtube-video-js
-assets/swiper
-assets/stickyfilljs
-assets/netlify-cms
-assets/jquery
-assets/fontawesome-free
-assets/jquery-toast-plugin
-assets/dompurify

.ruby-version

@@ -8,17 +8,19 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "4.2.2" # pinned awaiting release of https://github.com/jekyll/jekyll/pull/9304
+gem "jekyll", "~> 4.0"
 gem "execjs", "2.7.0" # https://github.com/rails/execjs/issues/99
 gem "autoprefixer-rails"
-gem "webrick" # not included in jekyll directly until 4.3.0 https://github.com/jekyll/jekyll/pull/8524
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
+  gem 'jekyll-include-cache'
   gem "jekyll-feed", "~> 0.6"
   gem 'jekyll-redirect-from'
+  gem 'jekyll-paginate-v2', "~> 3.0"
   gem 'jekyll-sitemap'
   gem 'jekyll-seo-tag'
+  gem 'jekyll-assets', git: "https://github.com/envygeeks/jekyll-assets"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -27,5 +29,5 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.0" if Gem.win_platform?
 
-gem "html-proofer", "~> 5"
+gem "html-proofer", "~> 3.15"
 gem "kramdown-parser-gfm"

Gemfile

@@ -1,47 +1,60 @@
+GIT
+  remote: https://github.com/envygeeks/jekyll-assets
+  revision: 056d2c88719ef3b1f90967a606dd1441581dd832
+  specs:
+    jekyll-assets (4.0.0.alpha)
+      activesupport (>= 5, < 7)
+      execjs (~> 2.7)
+      extras (~> 0.2)
+      fastimage (~> 2.0, >= 1.8)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-sanity (~> 1.2)
+      liquid-tag-parser (>= 1, < 3)
+      nokogiri (~> 1.10)
+      pathutil (~> 0.16)
+      sassc (>= 1.11, < 3.0)
+      sprockets (~> 4.0.beta7)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.1.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    afm (0.2.2)
-    async (2.6.3)
-      console (~> 1.10)
-      fiber-annotation
-      io-event (~> 1.1)
-      timers (~> 4.1)
-    autoprefixer-rails (10.4.13.0)
+    activesupport (6.1.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     colorator (1.1.0)
-    concurrent-ruby (1.2.2)
-    console (1.20.0)
-      fiber-annotation
-      fiber-local
+    concurrent-ruby (1.1.10)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.16.0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
+    eventmachine (1.2.7-x64-mingw32)
     execjs (2.7.0)
+    extras (0.3.0)
+      forwardable-extended (~> 2.5)
+    fastimage (2.2.6)
     ffi (1.15.5)
-    fiber-annotation (0.2.0)
-    fiber-local (1.0.0)
+    ffi (1.15.5-x64-mingw32)
     forwardable-extended (2.6.0)
-    hashery (2.1.2)
-    html-proofer (5.0.7)
+    html-proofer (3.19.3)
       addressable (~> 2.3)
-      async (~> 2.1)
-      nokogiri (~> 1.13)
-      pdf-reader (~> 2.11)
+      mercenary (~> 0.3)
+      nokogiri (~> 1.12)
+      parallel (~> 1.3)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
-      zeitwerk (~> 2.5)
     http_parser.rb (0.8.0)
-    i18n (1.14.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    io-event (1.2.3)
     jekyll (4.2.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
@@ -57,10 +70,17 @@ GEM
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
       terminal-table (~> 2.0)
-    jekyll-feed (0.17.0)
+    jekyll-feed (0.16.0)
       jekyll (>= 3.7, < 5.0)
+    jekyll-include-cache (0.2.1)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-paginate-v2 (3.0.0)
+      jekyll (>= 3.0, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
+    jekyll-sanity (1.6.0)
+      jekyll (>= 3.1, < 5.0)
+      pathutil (~> 0.16)
     jekyll-sass-converter (2.2.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-seo-tag (2.8.0)
@@ -73,61 +93,71 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.4)
-    listen (3.8.0)
+    liquid (4.0.3)
+    liquid-tag-parser (2.0.2)
+      extras (~> 0.3)
+      liquid (>= 3.0, < 5.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.4)
-    nokogiri (1.15.3)
-      mini_portile2 (~> 2.8.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    nokogiri (1.13.6-x64-mingw32)
       racc (~> 1.4)
+    parallel (1.22.1)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    pdf-reader (2.11.0)
-      Ascii85 (~> 1.0)
-      afm (~> 0.2.1)
-      hashery (~> 2.0)
-      ruby-rc4
-      ttfunk
-    public_suffix (5.0.3)
-    racc (1.7.1)
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rack (2.2.4)
     rainbow (3.1.1)
-    rb-fsevent (0.11.2)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
-    rouge (3.30.0)
-    ruby-rc4 (0.1.5)
+    rexml (3.2.5)
+    rouge (3.28.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
+    sassc (2.4.0-x64-mingw32)
+      ffi (~> 1.9)
+    sprockets (4.0.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
     terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    timers (4.3.5)
-    ttfunk (1.7.0)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2022.1)
+      tzinfo (>= 1.0.0)
     unicode-display_width (1.8.0)
-    webrick (1.8.1)
     yell (2.2.2)
-    zeitwerk (2.6.11)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   autoprefixer-rails
   execjs (= 2.7.0)
-  html-proofer (~> 5)
-  jekyll (= 4.2.2)
+  html-proofer (~> 3.15)
+  jekyll (~> 4.0)
+  jekyll-assets!
   jekyll-feed (~> 0.6)
+  jekyll-include-cache
+  jekyll-paginate-v2 (~> 3.0)
   jekyll-redirect-from
   jekyll-seo-tag
   jekyll-sitemap
   kramdown-parser-gfm
   tzinfo-data
-  webrick
 
 BUNDLED WITH
-   2.3.26
+   2.1.4

Gemfile.lock

@@ -0,0 +1,7 @@
+// Override USWDS mixin to use jekyll-assets asset_url()
+
+@mixin add-background-svg($image-name, $image-path: $theme-image-path) {
+  background-image: asset_url("#{$image-path}/#{$image-name}.svg"),
+    linear-gradient(transparent, transparent);
+  background-repeat: no-repeat;
+}

assets/css/components/jquery.dataTables.min.css renamed to _assets/css/components/jquery.dataTables.min.css

@@ -0,0 +1,4 @@
+@import "add-background-svg";
+@import "font-face";
+@import "hero";
+@import "icon";

assets/css/components/jquery.dataTables.min_ke.css renamed to _assets/css/components/jquery.dataTables.min_ke.css

@@ -0,0 +1,13 @@
+// Override USWDS mixin to use jekyll-assets asset_url()
+
+@mixin at-font-face($display-name, $file-path, $font-weight, $font-style) {
+  @font-face {
+    font-family: $display-name;
+    font-style: unquote($font-style);
+    font-weight: $font-weight;
+    font-display: fallback;
+    src: asset_url("'#{$file-path}.woff2'") format("woff2"),
+      asset_url("'#{$file-path}.woff'") format("woff"),
+      asset_url("'#{$file-path}.ttf'") format("truetype");
+  }
+}

assets/css/components/responsive.dataTables.minke.css renamed to _assets/css/components/responsive.dataTables.minke.css

@@ -0,0 +1,80 @@
+// Override USWDS mixin to use jekyll-assets asset_url()
+
+@mixin add-color-icon($icon-object, $contrast-bg: "default") {
+  $filename-base: map-get($icon-object, "name");
+  $svg-height: map-get($icon-object, "svg-height");
+  $svg-width: map-get($icon-object, "svg-width");
+  $aspect: divide($svg-width, $svg-height);
+  $height: if(
+    unitless(map-get($icon-object, "height")),
+    units(map-get($icon-object, "height")),
+    map-get($icon-object, "height")
+  );
+  $width: $height * $aspect;
+  $container-height: if(
+    map-has-key($icon-object, "container-height"),
+    units(map-get($icon-object, "container-height")),
+    null
+  );
+  $container-width: if(
+    map-has-key($icon-object, "container-width"),
+    units(map-get($icon-object, "container-width")),
+    null
+  );
+  $color: if(
+    map-has-key($icon-object, "color"),
+    map-get($icon-object, "color"),
+    "ink"
+  );
+  $color-variant: if(
+    map-has-key($icon-object, "color-variant"),
+    map-get($icon-object, "color-variant"),
+    "white"
+  );
+  $color-hover: if(
+    map-has-key($icon-object, "color-hover"),
+    map-get($icon-object, "color-hover"),
+    null
+  );
+  $rotate: if(
+    map-has-key($icon-object, "rotate"),
+    map-get($icon-object, "rotate"),
+    null
+  );
+  $path: if(
+    map-has-key($icon-object, "path"),
+    map-get($icon-object, "path"),
+    $theme-image-path
+  );
+  $ie11-variant: get-color-token-from-bg($contrast-bg, "white", "black");
+  $filename-ie11: if(
+    $ie11-variant == "white",
+    "usa-icons-bg/#{$filename-base}--white.svg",
+    "usa-icons/#{$filename-base}.svg"
+  );
+
+  $mask-props: asset_url("#{$path}/usa-icons/#{$filename-base}.svg") no-repeat center /
+    contain;
+  $image-props: asset_url("#{$path}/#{$filename-ie11}") no-repeat center / contain;
+
+  // Default background shorthand for browsers that don't support mask or supports.
+  background: $image-props;
+  display: inline-block;
+  height: if($container-height, $container-height, $height);
+  width: if($container-width, $container-width, $width);
+  @if $rotate {
+    transform: rotate($rotate);
+  }
+
+  // Mask supported styles
+  @supports (mask: url("")) {
+    background: none;
+    background-color: if($color == currentColor, $color, color($color));
+    mask: $mask-props;
+    @if $color-hover {
+      &:hover {
+        background-color: color($color-hover);
+      }
+    }
+  }
+}

_sass/components/sticky.scss renamed to _assets/css/components/sticky.scss

@@ -1,5 +1,4 @@
----
----
+
 
 // Import individual theme settings
 @import "theme/uswds-theme-general";
@@ -12,13 +11,14 @@
 @import "theme/uswds-theme-components";
 
 // Set correct paths for use with asset pipeline
-$theme-font-path: "../uswds/fonts";
-$theme-image-path: "../uswds/img";
+$theme-font-path: "fonts";
+$theme-image-path: "img";
 $theme-hero-image: asset_path("hero-wc-temp.jpg");
 
 // -------------------------------------
 // Import individual USWDS packages...
 @import "scss/packages/required";
+@import "overrides/all";
 @import "scss/packages/global";
 
 @import "scss/packages/uswds-components";