GSA · mejiaj · Sep 6, 2022 · Jul 27, 2022 · Jul 27, 2022 · Jul 28, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.6.2-node-browsers
+      - image: cimg/ruby:3.0.4-browsers
     working_directory: ~/repo
     steps:
       - checkout

diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,6 @@ _site
 .sass-cache
 .jekyll-metadata
 .DS_store
+
+assets/uswds/img/
+assets/uswds/fonts/
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,6 @@ gem "jekyll", "~> 3.9.2"
 gem "jekyll-redirect-from"
 
 group :jekyll_plugins do
-  gem 'jekyll_pages_api_search'
   gem 'jekyll-sitemap'
   gem 'jekyll-email-protect'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -21,7 +21,6 @@ GEM
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
-    htmlentities (4.3.4)
     http_parser.rb (0.8.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -47,12 +46,6 @@ GEM
       jekyll (>= 3.7, < 5.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 (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -99,7 +92,6 @@ DEPENDENCIES
   jekyll-email-protect
   jekyll-redirect-from
   jekyll-sitemap
-  jekyll_pages_api_search
   kramdown-parser-gfm
   rexml (~> 3.2)
   webrick (~> 1.7)

diff --git a/README.md b/README.md
@@ -32,6 +32,13 @@ To run the site locally, from the project folder, run:
 npm start
 ```
 
+If you are missing fonts or images, install assets for local development with:
+
+```
+npm run build
+```
+
+
 If all goes well, visit the site at `http://localhost:4000`.
 
 ## Accessibility tests

diff --git a/_config.yml b/_config.yml
@@ -52,10 +52,10 @@ plugins:
   - jekyll-redirect-from
   - jekyll-sitemap
 
+
 # Build settings
 scripts:
   - assets/uswds/js/uswds.min.js
-  - assets/js/bundle.js
 
 styles:
   - assets/uswds/css/styles.css

diff --git a/_includes/glossary.html b/_includes/glossary.html
@@ -2,7 +2,7 @@
   <div class="display-flex flex-column flex-align-end">
     <button title="Close glossary" class="js-glossary-close display-flex flex-align-center">
       <span class="margin-right-1">Close</span>
-      <img src="{{ '/assets/uswds/img/close-white.svg' | relative_url }}" alt="Hide glossary" />
+      <img src="{{ site.baseurl }}/assets/uswds/img/usa-icons-bg/close--white.svg" alt="Hide glossary" />
     </button>
   </div>
 

diff --git a/_includes/header.html b/_includes/header.html
@@ -7,7 +7,7 @@
     <button class="usa-menu-btn text-semibold">Menu</button>
   </div>
   <nav role="navigation" class="usa-nav">
-    <div class="usa-nav__inner"><button class="usa-nav__close"><img src="{{ '/assets/uswds/img/close.svg' | relative_url }}" alt="close" /></button>
+    <div class="usa-nav__inner"><button class="usa-nav__close"><img src="{{ site.baseurl }}/assets/uswds/img/usa-icons/close.svg" alt="close" /></button>
 
       {% assign primary_links = site.data.navigation %} {% if primary_links %}
       <ul class="usa-nav__primary usa-accordion">
@@ -34,12 +34,17 @@
             <a href="{{ '/contact' | relative_url}}">Get PRA Help</a>
           </li>
         </ul>
-        <form action="{{ '/search/' | relative_url}}" class="usa-search usa-search--small ">
-          <div role="search">
-            <label class="usa-sr-only" for="search-input">Search</label>
-            <input class="usa-input" id="search-input" type="search" name="q">
-            <button class="usa-button" type="submit"><span class="usa-sr-only">Search</span></button>
-          </div>
+        <form class="usa-search usa-search--small site-search" role="search" action="https://search.usa.gov/search" accept-charset="UTF-8" method="get">
+          <input type="hidden" name="affiliate" id="affiliate" value="digitalgov-pra" autocomplete="off" />
+          <label for="query" class="usa-sr-only"></label>
+          <input type="text" name="query" id="query" autocomplete="off" class="usagov-search-autocomplete" />
+          <button class="usa-button" type="submit">
+            <img
+              src="{{ '/assets/uswds/img/usa-icons-bg/search--white.svg' | relative_url }}"
+              class="usa-search__submit-icon"
+              alt="Search"
+            />
+          </button>
         </form>
       </div>
     </div>

diff --git a/_includes/identifier.html b/_includes/identifier.html
@@ -82,7 +82,7 @@
       <div class="usa-identifier__usagov-description">
         Looking for U.S. government information and services?
       </div>
-      <a href="https://www.usa.gov/" class="usa-link">Visit USA.gov</a>
+      <a href="https://www.usa.gov/" class="usa-link usa-link--external">Visit USA.gov</a>
     </div>
   </section>
 </div>
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -23,9 +23,9 @@
 <script src="{{ _src | replace: _async_marker, '' | relative_url }}" {% if _script.async or _src contains _async_marker %} async{% endif %}></script>
 {% endfor %}{% endfor %}
 
-{% if page.layout == 'search-results' %}
-{% jekyll_pages_api_search_load %}
-{% endif %}
+
+<script async type="text/javascript" src="{{ "assets/uswds/js/bundle.js" | relative_url }}"></script>
 
 <!-- We participate in the US government's analytics program. See the data at analytics.usa.gov. -->
 <script async type="text/javascript" src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA&subagency=TTS" id="_fed_an_ua_tag"></script>
+<script src="//search.usa.gov/javascripts/remote.loader.js"></script>
diff --git a/_includes/styles.html b/_includes/styles.html
@@ -5,4 +5,4 @@
 page.styles | uniq %} {% for _list in _styles %}{% for _style in _list %}
 <link rel="stylesheet" href="{{ _style.href | default: _style | relative_url }}" media="{{ _style.media | default: 'screen' }}" />
 {% endfor %}{% endfor %}
-<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous" />
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous" />
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -9,6 +9,7 @@
 
 <head>
 {% include google-analytics.html %}
+<script async type="text/javascript" src="{{ "assets/uswds/js/uswds-init.min.js" | relative_url }}"></script>
 {% include meta.html %} {% include styles.html %}
 </head>
 

diff --git a/_layouts/search-results.html b/_layouts/search-results.html
diff --git a/_scss/_theme-variables.scss b/_scss/_theme-variables.scss
@@ -0,0 +1,9 @@
+$theme-h1-mobile-font-size: "xl";
+$theme-h2-mobile-font-size: "lg";
+$theme-h3-mobile-font-size: "md";
+$theme-h4-mobile-font-size: "sm";
+$theme-h5-mobile-font-size: "xs";
+$theme-navigation-width:    "desktop";
+$theme-identifier-background-color: "indigo-warm-80";
+$theme-identifier-primary-link-color: "gray-cool-30";
+$theme-identifier-secondary-link-color: "gray-cool-10";
diff --git a/_scss/_uswds-theme-color.scss b/_scss/_uswds-theme-color.scss
diff --git a/_scss/_uswds-theme-components.scss b/_scss/_uswds-theme-components.scss
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     <head>
     {% include google-analytics.html %}
+    <script async type="text/javascript" src="{{ "assets/uswds/js/uswds-init.min.js" | relative_url }}"></script>
     {% include meta.html %} {% include styles.html %}
     </head>
@@ Expand Down @@