remove old uswds, add latest uswds-jekyll + search

Signed-off-by: Robert Jolly <[email protected]>

Author: iamjolly

.bundler-version

@@ -1 +1 @@
-1.17.3
+2.1.4

.gitignore

@@ -4,3 +4,4 @@ _site
 *.log
 .*.swp
 .jekyll-metadata
+.jekyll-cache

Gemfile

@@ -1,8 +1,30 @@
 source 'https://rubygems.org'
-gem 'jekyll', '~> 3.6.3' #Locking down bc https://github.com/18F/jekyll_pages_api_search/issues/37
-gem 'uswds-jekyll'
-gem 'redcarpet'
-gem 'rouge'
-gem 'go_script'
-gem 'accesslint-ci'
+
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+gem 'jekyll', '~> 4.1.1'
 gem 'jekyll-sitemap'
+
+# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem 'uswds-jekyll', '~> 5.0'
+
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+# gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  gem "jekyll-feed", "~> 0.6"
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+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?

Gemfile.lock

@@ -1,84 +1,77 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    accesslint-ci (0.3.6)
-      rest-client (~> 2.0.1)
-      thor (~> 0.19.4)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    ffi (1.11.2)
+    concurrent-ruby (1.1.7)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
-    go_script (0.1.9)
-      bundler (~> 1.10)
-      safe_yaml (~> 1.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    jekyll (3.6.3)
+    http_parser.rb (0.6.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.1.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.14)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 3)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-watch (1.5.1)
+      terminal-table (~> 1.8)
+    jekyll-feed (0.15.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mime-types (3.3)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    netrc (0.11.0)
+    mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    public_suffix (4.0.6)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redcarpet (3.5.0)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rouge (2.2.1)
+    rexml (3.2.4)
+    rouge (3.23.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    thor (0.19.4)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.6)
-    uswds-jekyll (4.2.0)
-      jekyll (~> 3.4)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
+    uswds-jekyll (5.0.0)
+      jekyll (>= 4.0, < 5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  accesslint-ci
-  go_script
-  jekyll (~> 3.6.3)
+  jekyll (~> 4.1.1)
+  jekyll-feed (~> 0.6)
   jekyll-sitemap
-  redcarpet
-  rouge
-  uswds-jekyll
+  tzinfo-data
+  uswds-jekyll (~> 5.0)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

_config.yml

@@ -1,4 +1,47 @@
+# Welcome to Jekyll!
+#
+# This config file is meant for settings that affect your whole blog, values
+# which you are expected to set up once and rarely edit after that. If you find
+# yourself editing this file very often, consider using Jekyll's data files
+# feature for the data you need to update frequently.
+#
+# For technical reasons, this file is *NOT* reloaded automatically when you use
+# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
+
+# Site settings
+# These are used to personalize your new site. If you look in the HTML files,
+# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
+# You can create any custom variable you would like, and they will be accessible
+# in the templates via {{ site.myvariable }}.
 title: 18F Accessibility Guide
+description: >-
+  This is the 18F Accessibility Guide.
+baseurl: "" # the subpath of your site, e.g. /blog
+url: "https://accessibility.18f.gov" # the base hostname & protocol for your site, e.g. http://example.com
+twitter_username: jekyllrb
+github_username:  jekyll
+
+include: ['_pages']
+
+# Build settings
+markdown: kramdown
+theme: uswds-jekyll
+plugins:
+  - jekyll-feed
+  - jekyll-sitemap
+
+# Google Analytics & DAP tracking code for handbook
+google_analytics_ua: UA-48605964-19
+dap_agency: GSA
+
+# Add search site handle to enable search
+search_site_handle: 18f-accessibility
+
+scripts:
+  - assets/uswds/js/uswds.min.js
+  - javascripts/private-eye.js
+  - javascripts/application.js
+
 exclude:
 - CONTRIBUTING.md
 - Gemfile
@@ -8,12 +51,6 @@ exclude:
 - go
 - vendor
 
-url: "https://accessibility.18f.gov"
-plugins:
-  - jekyll-sitemap
-
-theme: uswds-jekyll
-
 markdown: kramdown
 highlighter: rouge
 permalink: pretty
@@ -25,7 +62,7 @@ defaults:
       path: ""
       type: "pages"
     values:
-      layout: page
+      layout: post
 
 sass:
   style: :compressed
@@ -47,6 +84,3 @@ repos:
 - name: Accessibility
   description: Main repository
   url: https://github.com/18F/accessibility
-
-google_analytics_ua: UA-48605964-19
-dap_agency: GSA

_data/favicons.yml

@@ -30,5 +30,7 @@ type: extended
 # links: primary
 
 # this is a key into _data/navigation.yml
+primary:
+  links: primary
 secondary:
   links: secondary

_data/footer.yml

@@ -1,13 +1,23 @@
 # _data/navigation.yml
+primary:
+  - text: Home
+    href: /
+  - text: Accessibility for Teams
+    href: https://accessibility.digital.gov/
+    external: true
+  - text: Section508.gov
+    href: http://section508.gov/
+    external: true
+  - text: More 18F guides
+    href: https://18f.gsa.gov/guides/
+    external: true
 
 secondary:
   - text: More 18F guides
     href: https://18f.gsa.gov/guides/
     external: true
 
 docs:
-  - text: Home
-    href: /
   - text: Checklist
     href: /checklist/
   - text: Tools