switch to uswds-jekyll theme

.circleci/config.yml

@@ -2,7 +2,10 @@ version: 2
 jobs:
   build:
     docker:
-      - image: starefossen/ruby-node:2-8
+      - image: ruby:2.7
+    environment:
+      # fix encoding
+      - LANG: C.UTF-8
     steps:
       - checkout
       - run: bundle

.gitignore

@@ -4,4 +4,5 @@ _test_site/
 .sass-cache/
 .DS_store
 .*.swp
+.jekyll-cache/
 .jekyll-metadata

.ruby-version

@@ -0,0 +1 @@
+2.7.1

Dockerfile

@@ -1,13 +1,11 @@
-FROM starefossen/ruby-node:2-8
+FROM ruby:2.7
 
 WORKDIR /usr/src/app
 
 COPY Gemfile Gemfile.lock ./
-RUN bundle install
+RUN gem install bundler && \
+  bundle install
 
-# COPY . .
-
-# Set some other necessary ENVs
 ENV LC_ALL=C.UTF-8
 
 CMD bundle exec jekyll serve --host 0.0.0.0 --incremental

Gemfile

@@ -1,14 +1,13 @@
 source 'https://rubygems.org'
 
-# https://github.com/18F/jekyll_pages_api_search/issues/37
-gem 'jekyll', '~> 3.1.0'
+gem 'jekyll'
 
 group :jekyll_plugins do
-  gem "guides_style_18f", :github => '18F/guides-style', :branch => 'v1.0.6'
+  gem 'uswds-jekyll', github: '18F/uswds-jekyll', branch: 'update-uswds-2.0'
   gem 'jekyll-redirect-from'
 end
 
 group :development, :test do
-  gem 'html-proofer', '~> 3.15'
+  gem 'html-proofer'
   gem 'rake'
 end

Gemfile.lock

@@ -1,24 +1,26 @@
 GIT
-  remote: git://github.com/18F/guides-style.git
-  revision: 5bc8289e08638edd311e62806de4b6fc5f2a0135
-  branch: v1.0.6
+  remote: https://github.com/18F/uswds-jekyll.git
+  revision: 7cf641447784b9769950bc15a21121a81ef29bea
+  branch: update-uswds-2.0
   specs:
-    guides_style_18f (1.0.6)
-      jekyll
-      jekyll_pages_api
-      jekyll_pages_api_search
-      rouge
-      sass
+    uswds-jekyll (5.0.0)
+      jekyll (>= 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    colorator (0.1)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.6)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    ffi (1.12.2)
+    eventmachine (1.2.7)
+    ffi (1.13.0)
+    forwardable-extended (2.6.0)
     html-proofer (3.15.3)
       addressable (~> 2.3)
       mercenary (~> 0.3)
@@ -27,66 +29,74 @@ GEM
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
-    htmlentities (4.3.4)
-    jekyll (3.1.6)
-      colorator (~> 0.1)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
-      liquid (~> 3.0)
-      mercenary (~> 0.3.3)
-      rouge (~> 1.7)
+    http_parser.rb (0.6.0)
+    i18n (1.8.3)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.1.0)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      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.4.0)
+      pathutil (~> 0.9)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-redirect-from (0.11.0)
-      jekyll (>= 2.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-watch (1.5.1)
+      terminal-table (~> 1.8)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jekyll_pages_api (0.1.6)
-      htmlentities (~> 4.3)
-      jekyll (>= 2.0, < 4.0)
-    jekyll_pages_api_search (0.5.0)
-      jekyll_pages_api (~> 0.1.4)
-      sass (~> 3.4)
-    kramdown (1.17.0)
-    liquid (3.0.6)
+    kramdown (2.2.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
+    mercenary (0.4.0)
     mini_portile2 (2.4.0)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
     parallel (1.19.1)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
     public_suffix (4.0.5)
     rainbow (3.0.0)
     rake (13.0.1)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (1.11.1)
+    rexml (3.2.4)
+    rouge (3.19.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)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
+    unicode-display_width (1.7.0)
     yell (2.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  guides_style_18f!
-  html-proofer (~> 3.15)
-  jekyll (~> 3.1.0)
+  html-proofer
+  jekyll
   jekyll-redirect-from
   rake
+  uswds-jekyll!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

Rakefile

@@ -1,10 +1,3 @@
-require 'guides_style_18f'
-
-desc "Update the 'navigation:' data in _config.yml"
-task :update_nav do
-  GuidesStyle18F.update_navigation_configuration Dir.pwd
-end
-
 desc 'Build the site for testing'
 task :test_build do
   # https://github.com/jekyll/jekyll/issues/4122#issuecomment-159439360

_config.yml

@@ -1,133 +1,26 @@
-name: Before you ship
+title: Before You Ship
+theme: uswds-jekyll
 exclude:
-- CONTRIBUTING.md
-- Gemfile
-- Gemfile.lock
-- LICENSE.md
-- README.md
-- go
-- vendor/
+  - CONTRIBUTING.md
+  - Gemfile
+  - Gemfile.lock
+  - LICENSE.md
+  - README.md
+  - vendor/
 
 permalink: pretty
 
-markdown: kramdown
-kramdown:
-  input: GFM
-
 sass:
   style: :compressed
 
-# Author/Organization info to be displayed in the templates
-author:
-  name: 18F
-  url: https://18f.gsa.gov
-
-# Point the logo URL at a file in your repo or hosted elsewhere by your organization
-logourl: /assets/img/18f-logo.png
-logoalt: 18F logo
-
-# Navigation
-# List links that should appear in the site sidebar here
-navigation:
-- text: Overview
-  url: ''
-  internal: true
-- text: Lifecycle of a Launch
-  url: ato/
-  internal: true
-  children:
-  - text: Checklist
-    url: checklist/
-    internal: true
-  - text: Types
-    url: types/
-    internal: true
-  - text: System Security Plan
-    url: ssp/
-    internal: true
-  - text: Archer
-    url: archer/
-    internal: true
-  - text: Tips
-    url: tips/
-    internal: true
-- text: Security
-  url: security/
-  internal: true
-  children:
-  - text: Scanning
-    url: scanning/
-    internal: true
-  - text: Static Analysis
-    url: static-analysis/
-    internal: true
-  - text: Dynamic Scanning
-    url: dynamic-scanning/
-    internal: true
-  - text: Frameworks
-    url: frameworks/
-    internal: true
-  - text: Multi-Factor Authentication
-    url: mfa/
-    internal: true
-- text: Infrastructure
-  url: infrastructure/
-  internal: true
-  children:
-  - text: Sandbox Accounts
-    url: sandbox/
-    internal: true
-  - text: Amazon Web Services
-    url: aws/
-    internal: true
-  - text: Federalist
-    url: federalist/
-    internal: true
-  - text: Good Production Practices
-    url: good-production-practices/
-    internal: true
-  - text: Common Questions
-    url: common-questions/
-    internal: true
-  - text: HTTPS Certificates
-    url: certs/
-    internal: true
-  - text: Monitoring
-    url: monitoring/
-    internal: true
-  - text: Pinning Dependencies
-    url: pinning-dependencies/
-    internal: true
-  - text: Logging
-    url: logging/
-    internal: true
-  - text: Decommissioning
-    url: decommissioning/
-    internal: true
-- text: Laws
-  url: laws/
-  internal: true
-  children:
-  - text: 508 - Accessibility
-    url: 508/
-    internal: true
-  - text: Paperwork Reduction Act (PRA)
-    url: https://pra.digital.gov/
-    internal: false
-- text: Privacy
-  url: privacy/
-  internal: true
-
-repos:
-- name: Guides Template
-  description: Main repository
-  url: https://github.com/18F/before-you-ship
+github_info:
+  organization: 18F
+  repository: before-you-ship
+  default_branch: master
 
 google_analytics_ua: UA-48605964-19
 
-back_link:
-  url: "https://18f.gsa.gov/guides/"
-  text: Read more 18F guides
+search_site_handle: before-you-ship
 
 styles:
   - assets/css/custom.css
@@ -138,25 +31,7 @@ collections:
     permalink: /:path/
 
 defaults:
-  -
-    scope:
+  - scope:
       path: ""
     values:
-      layout: "guides_style_18f_default"
-
-# Configuration for jekyll_pages_api_search plugin gem.
-jekyll_pages_api_search:
-  # Uncomment this to speed up site generation while developing.
-  #skip_index: true
-
-  # Each member of `index_fields` should correspond to a field generated by
-  # the jekyll_pages_api. It can hold an optional `boost` member as a signal
-  # to Lunr.js to weight the field more highly (default is 1).
-  index_fields:
-    title:
-      boost: 10
-    tags:
-      boost: 10
-    url:
-      boost: 5
-    body:
+      layout: page

_data/footer.yml

@@ -0,0 +1,8 @@
+type: default
+heading: Technology Transformation Services (TTS)
+edit_page:
+  text: Edit this page
+contact:
+  contact_links:
+    - text: devops@gsa.gov
+      href: mailto:devops@gsa.gov