initial commit

GSA · Nov 6, 2023 · 4ff9f13 · 4ff9f13
1 parent bd3e938
commit 4ff9f13
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 135 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.6
+3.1.3
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6.6
+FROM ruby:3.1.3
 
 RUN apt-get update && \
   apt-get install --reinstall -y locales && \

diff --git a/Gemfile b/Gemfile
@@ -1,20 +1,16 @@
-ruby '>= 2.6.6'
+ruby '>= 3.1.3'
 
 source "https://rubygems.org"
 
 gem "jekyll", "~> 3.9"
-
-# See https://github.com/envygeeks/jekyll-assets/issues/622
+gem "webrick"
 gem "sprockets", "~> 3.7"
 gem "kramdown-parser-gfm", "~> 1.1.0"
 
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.15"
-  gem 'jekyll-redirect-from'
   gem 'jekyll-paginate-v2', "3.0.0"  
   gem 'jekyll-sitemap'
   gem 'jekyll-seo-tag'
-  gem "jekyll-assets", "~> 3.0", group: :jekyll_plugins
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

diff --git a/_assets/css/index.scss b/_assets/css/index.scss
diff --git a/_assets/js/app.js b/_assets/js/app.js
diff --git a/_assets/uploads/cloud-gov-logo.png b/_assets/uploads/cloud-gov-logo.png
diff --git a/_config.yml b/_config.yml
@@ -260,27 +260,18 @@ exclude:
   - Gemfile
   - Gemfile.lock
 
-assets:
-  digest: false
-  autoprefixer:
-    browsers:
-      - "> 2%"
-      - "last 2 versions"
-      - "IE 11"
-      - "not dead"
-  compression: true
-  sources:
-    - node_modules/uswds/dist
-    - node_modules/uswds/dist/img
-    - node_modules/uswds/dist/js
-    - node_modules/uswds/dist/scss
-    - node_modules/netlify-cms/dist
-    - _assets/img
-    - _assets/js
-    - _assets/css
-  defaults:
-    js:  { integrity: false }
-    css: { integrity: false }
-    img: { integrity: false }
-  features:
-    integrity: false
+autoprefixer:
+  browsers:
+    - "> 2%"
+    - "last 2 versions"
+    - "IE 11"
+    - "not dead"
+
+sass:
+  sass_dir: _sass
+  load_paths:
+    - node_modules/uswds/dist/
+  sourcemap: development
+  quiet_deps: true
+  style: compressed
+  verbose: true
diff --git a/_includes/header.html b/_includes/header.html
@@ -14,7 +14,7 @@
       <section id="gov-banner-header-section" aria-label="USA Gov banner section header" class="usa-banner__header">
         <div class="usa-banner__inner">
           <div class="grid-col-auto">
-            {% asset us_flag_small.png class="usa-banner__header-flag" alt="U.S. flag" %}
+              <img class="usa-banner__header-flag" alt="U.S. flag" src="{{ site.baseurl }}/assets/img/us_flag_small.png">
           </div>
           <div class="grid-col-fill tablet:grid-col-auto">
             <p class="usa-banner__header-text">An official website of the United States government</p>
@@ -28,7 +28,7 @@
       <div class="usa-banner__content usa-accordion__content" id="gov-banner">
         <div class="grid-row grid-gap-lg">
           <div class="usa-banner__guidance tablet:grid-col-6">
-            {% asset icon-dot-gov.svg class="usa-banner__icon usa-media-block__img" alt="Dot gov" %}
+              <img class="usa-banner__icon usa-media-block__img" alt="Dot gov" src="{{ site.baseurl }}/assets/img/icon-dot-gov.svg">
             <div class="usa-media-block__body">
               <p>
                 <strong>The .gov means it’s official.</strong>
@@ -39,7 +39,7 @@
             </div>
           </div>
           <div class="usa-banner__guidance tablet:grid-col-6">
-            {% asset icon-https.svg class="usa-banner__icon usa-media-block__img" alt="Https" %}
+              <img class="usa-banner__icon usa-media-block__img" alt="Https" src="{{ site.baseurl }}/assets/img/icon-https.svg">
             <div class="usa-media-block__body">
               <p>
                 <strong>The site is secure.</strong>

diff --git a/_includes/menu.html b/_includes/menu.html
@@ -17,7 +17,7 @@
   >
     <div class="usa-nav__inner">
       <button class="usa-nav__close">
-        {% asset close.svg alt="close" %}
+         <img alt="close" src="{{ site.baseurl }}/assets/img/close.svg"/>
       </button>
       <ul class="usa-nav__primary usa-accordion">
         {% for nav_item in include.primary_navigation %} {% unless

diff --git a/_includes/meta.html b/_includes/meta.html
@@ -4,49 +4,49 @@
 {% endcomment %}
 
 <head>
-  <!-- Basic Page Needs
-    ================================================== -->
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="robots" content="noindex, nofollow">
-  <!-- Mobile Specific Metas
-    ================================================== -->
-  <meta name="HandheldFriendly" content="True">
-  <meta name="MobileOptimized" content="320">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <!-- Title and meta description
-    ================================================== -->
-  <title>{{site.title}}</title>
-  <meta property="og:title" content="{{site.title}}">
-  <meta name="description" content="{{site.description}}">
-  <meta property="og:description" content="{{site.description}}">
+    <!-- Basic Page Needs
+      ================================================== -->
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="robots" content="noindex, nofollow">
+    <!-- Mobile Specific Metas
+      ================================================== -->
+    <meta name="HandheldFriendly" content="True">
+    <meta name="MobileOptimized" content="320">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- Title and meta description
+      ================================================== -->
+    <title>{{site.title}}</title>
+    <meta property="og:title" content="{{site.title}}">
+    <meta name="description" content="{{site.description}}">
+    <meta property="og:description" content="{{site.description}}">
 
-  <meta name="twitter:card" content="summary" />
-  <meta name="twitter:site" content="@{{site.twitter}}" />
-  <meta name="twitter:title" content="{{site.title}}" />
-  <meta name="twitter:description" content="{{site.description}}" />
+    <meta name="twitter:card" content="summary" />
+    <meta name="twitter:site" content="@{{site.twitter}}" />
+    <meta name="twitter:title" content="{{site.title}}" />
+    <meta name="twitter:description" content="{{site.description}}" />
 
-  <meta property="og:type" content="article">
-  <link rel="canonical" href="{{ page.url | absolute_url }}" />
-  <meta property="og:url" content="{{ page.url | absolute_url }}" />
-  <!-- Favicons
-    ================================================== -->
-  <!-- 128x128 -->
-  <link rel="shortcut icon" type="image/ico" href="{% asset favicons/favicon.ico @path %}">
-  <link rel="icon" type="image/png" href="{% asset favicons/favicon.png @path %}">
-  <!-- 192x192, as recommended for Android
-    http://updates.html5rocks.com/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
-    -->
-  <link rel="icon" type="image/png" sizes="192x192" href="{% asset favicons/favicon-192.png @path %}">
-  <!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
-  <link rel="apple-touch-icon-precomposed" href="{% asset favicons/favicon-57.png @path %}">
-  <!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
-  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% asset favicons/favicon-72.png @path %}">
-  <!-- 114x114 (precomposed) for iPhone 4, 4S, 5 and post-2011 iPod Touch -->
-  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% asset favicons/favicon-114.png @path %}">
-  <!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% asset favicons/favicon-144.png @path %}">
-  <!-- CSS
-    ================================================== -->
-  {% asset index.scss %}
+    <meta property="og:type" content="article">
+    <link rel="canonical" href="{{ page.url | absolute_url }}" />
+    <meta property="og:url" content="{{ page.url | absolute_url }}" />
+    <!-- Favicons
+      ================================================== -->
+    <!-- 128x128 -->
+    <link rel="shortcut icon" type="image/ico" href="{% asset favicons/favicon.ico @path %}">
+    <link rel="icon" type="image/png" href="{% asset favicons/favicon.png @path %}">
+    <!-- 192x192, as recommended for Android
+      http://updates.html5rocks.com/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
+      -->
+    <link rel="icon" type="image/png" sizes="192x192" href="{% asset favicons/favicon-192.png @path %}">
+    <!-- 57x57 (precomposed) for iPhone 3GS, pre-2011 iPod Touch and older Android devices -->
+    <link rel="apple-touch-icon-precomposed" href="{% asset favicons/favicon-57.png @path %}">
+    <!-- 72x72 (precomposed) for 1st generation iPad, iPad 2 and iPad mini -->
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{% asset favicons/favicon-72.png @path %}">
+    <!-- 114x114 (precomposed) for iPhone 4, 4S, 5 and post-2011 iPod Touch -->
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="{% asset favicons/favicon-114.png @path %}">
+    <!-- 144x144 (precomposed) for iPad 3rd and 4th generation -->
+    <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{% asset favicons/favicon-144.png @path %}">
+    <!-- CSS
+      ================================================== -->
+    <link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/assets/css/index.css?{{ site.time | date: '%s%N' }}">
 </head>
diff --git a/admin/index.html b/admin/index.html
@@ -8,7 +8,7 @@
 </head>
 <body>
   <!-- Include the script that builds the page and powers Netlify CMS -->
-  {% asset netlify-cms.js %}
+  <script src="{{ site.baseurl }}/assets/js/netlify-cms.js?{{ site.time | date: '%s%N' }}"></script>
   <link href="/admin/config.yml" type="text/yaml" rel="cms-config-url">
   <style>
     img[alt="Logo"] {