diff --git a/.gitignore b/.gitignore index 1a2afb19f..de448ae88 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,11 @@ node_modules .DS_Store Gemfile.lock *.idea -.idea/* \ No newline at end of file +.idea/* +Gemfile.lock +.DS_Store +assets/img +assets/fonts +assets/js/uswds.js +assets/js/uswds.min.js +assets/js/uswds.min.js.map \ No newline at end of file diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 000000000..ff365e06b --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.1.3 diff --git a/Gemfile b/Gemfile index 12df3b996..38045e143 100644 --- a/Gemfile +++ b/Gemfile @@ -1,35 +1,24 @@ -ruby '>= 2.5.7' +ruby '>= 3.1.3' source "https://rubygems.org" -# 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", "~> 3.8" +gem "webrick" # not included in jekyll directly until 4.3.0 https://github.com/jekyll/jekyll/pull/8524 + # See https://github.com/envygeeks/jekyll-assets/issues/622 gem "sprockets", "~> 3.7" - -# If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.6" - gem 'jekyll-redirect-from' - gem 'jekyll-paginate-v2', "2.0" + gem 'jekyll-paginate-v2', "3.0.0" gem 'jekyll-sitemap' gem 'jekyll-seo-tag' -gem "jekyll-assets", group: :jekyll_plugins - + gem "jekyll-feed", "~> 0.6" + gem 'jekyll-redirect-from' 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? -gem "html-proofer", "~> 3.10" \ No newline at end of file +gem "html-proofer", "~> 3.15" +gem "kramdown-parser-gfm", "1.1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 7034408c7..875c6a6ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,108 +1,79 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) colorator (1.1.0) - concurrent-ruby (1.1.6) - em-websocket (0.5.1) + concurrent-ruby (1.2.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) + http_parser.rb (~> 0) + ethon (0.16.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.1.7) - ffi (1.12.2) - ffi (1.12.2-x64-mingw32) + ffi (1.16.3-x64-mingw-ucrt) forwardable-extended (2.6.0) - html-proofer (3.15.3) + html-proofer (3.19.4) addressable (~> 2.3) mercenary (~> 0.3) - nokogumbo (~> 2.0) - parallel (~> 1.3) + nokogiri (~> 1.13) + parallel (~> 1.10) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) - http_parser.rb (0.6.0) - i18n (0.9.5) + http_parser.rb (0.8.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (3.8.7) + jekyll (3.9.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) + i18n (>= 0.7, < 2) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (>= 1.17, < 3) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-assets (3.0.12) - activesupport (~> 5.0) - execjs (~> 2.7) - extras (~> 0.2) - fastimage (~> 2.0, >= 1.8) - jekyll (>= 3.5, < 4.0) - jekyll-sanity (~> 1.2) - liquid-tag-parser (~> 1.0) - nokogiri (~> 1.8) - pathutil (~> 0.16) - sprockets (>= 3.3, < 4.1.beta) - jekyll-feed (0.13.0) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) - jekyll-paginate-v2 (2.0.0) - jekyll (~> 3.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 (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.6.1) - jekyll (>= 3.3, < 5.0) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.17.0) - liquid (4.0.3) - liquid-tag-parser (1.9.0) - extras (~> 0.3) - liquid (>= 3.0, < 5.0) - listen (3.2.1) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.4.0) - minitest (5.14.1) - nokogiri (1.10.9) - mini_portile2 (~> 2.4.0) - nokogiri (1.10.9-x64-mingw32) - mini_portile2 (~> 2.4.0) - nokogumbo (2.0.2) - nokogiri (~> 1.8, >= 1.8.4) - parallel (1.19.1) + nokogiri (1.15.4-x64-mingw-ucrt) + racc (~> 1.4) + parallel (1.23.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.5) - rack (2.2.3) - rainbow (3.0.0) - rb-fsevent (0.10.4) + public_suffix (5.0.3) + racc (1.7.3) + rack (2.2.8) + rainbow (3.1.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.19.0) + rexml (3.2.6) + rouge (3.30.0) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -112,33 +83,35 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) - thread_safe (~> 0.1) - tzinfo-data (1.2020.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + tzinfo-data (1.2023.3) tzinfo (>= 1.0.0) + wdm (0.1.1) + webrick (1.8.1) yell (2.2.2) PLATFORMS - ruby - x64-mingw32 + x64-mingw-ucrt DEPENDENCIES - html-proofer (~> 3.10) + html-proofer (~> 3.15) jekyll (~> 3.8) - jekyll-assets jekyll-feed (~> 0.6) - jekyll-paginate-v2 (= 2.0) + jekyll-paginate-v2 (= 3.0.0) jekyll-redirect-from jekyll-seo-tag jekyll-sitemap + kramdown-parser-gfm (= 1.1.0) sprockets (~> 3.7) tzinfo-data + wdm (~> 0.1.0) + webrick RUBY VERSION - ruby 2.5.7p206 + ruby 3.1.4p223 BUNDLED WITH - 1.17.3 \ No newline at end of file + 2.4.21 diff --git a/README.md b/README.md index 804b536e3..1fbfef2e0 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ searchgov: - We try to keep configuration options to a minimum so you can easily change functionality. You should review `_config.yml` to see the options that are available to you. There are a few values on top that you **need** to change. They refer to the agency name and contact information. The rest of `_config.yml` has a range of more advanced options. -- The contents inside `assets/` folder store your Javascript, SCSS/CSS, images, and other media assets are managed by [jekyll-assets](https://github.com/envygeeks/jekyll-assets). Assets are combined, compressed, and automatically available in your theme +- The `assets/` folder stores your Javascript, CSS, images, and other media assets. Additional SASS partials should be added to the `_sass/` folder where they can be imported. USWDS assets are automatically copied into the `assets/` folder when running `jekyll serve` or `jekyll build` - If you look at `package.json` you will see that the `npm run federalist` command that will run when running on the Federalist platform. diff --git a/_config.yml b/_config.yml index b76b52423..802f51ec9 100644 --- a/_config.yml +++ b/_config.yml @@ -189,7 +189,6 @@ plugins: - jekyll-redirect-from - jekyll-sitemap - jekyll-seo-tag - - jekyll-assets ############################################################ # Site configuration for the Jekyll 3 Pagination Gem @@ -247,19 +246,21 @@ exclude: - Gemfile.lock -assets: - digest: false - sources: - - node_modules/uswds/dist/img - - node_modules/uswds/dist/js - - node_modules/uswds/dist/scss - - node_modules/netlify-cms/dist - 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 index 789b39a38..07a8dc876 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -9,7 +9,7 @@
- {% asset us_flag_small.png class="usa-banner__header-flag" alt="U.S. flag" %} + U.S. flag

An official website of the United States government

@@ -23,7 +23,7 @@
- {% asset icon-dot-gov.svg class="usa-banner__icon usa-media-block__img" alt="Dot gov" %} + Dot gov

The .gov means it's official. @@ -34,7 +34,7 @@

- {% asset icon-https.svg class="usa-banner__icon usa-media-block__img" alt="Https" %} + Https

The site is secure. diff --git a/_includes/highlights.html b/_includes/highlights.html index 09d501a9c..fe1d3f18e 100644 --- a/_includes/highlights.html +++ b/_includes/highlights.html @@ -7,40 +7,48 @@

-
- {% asset circle-124.png class="usa-media-block__img" alt="Alt text" %} -
-

Graphic headings can vary.

-

Graphic headings can be used a few different ways, depending on what your landing page is for. Highlight - your values, specific program areas, or results.

+
+ Alt text +
+

Graphic headings can vary.

+

+ Graphic headings can be used a few different ways, depending on what your landing page is for. Highlight + your values, specific program areas, or results. +

+
-
-
- {% asset circle-124.png class="usa-media-block__img" alt="Alt text" %} -
-

Stick to 6 or fewer words.

-

Keep body text to about 30 words. They can be shorter, but try to be somewhat balanced across all four. It - creates a clean appearance with good spacing.

+
+ Alt text +
+

Stick to 6 or fewer words.

+

+ Keep body text to about 30 words. They can be shorter, but try to be somewhat balanced across all four. It + creates a clean appearance with good spacing. +

+
-
-
- {% asset circle-124.png class="usa-media-block__img" alt="Alt text" %} -
-

Never highlight anything without a goal.

-

For anything you want to highlight here, understand what your users know now, and what activity or - impression you want from them after they see it.

+
+ Alt text +
+

Never highlight anything without a goal.

+

+ For anything you want to highlight here, understand what your users know now, and what activity or + impression you want from them after they see it. +

+
-
-
- {% asset circle-124.png class="usa-media-block__img" alt="Alt text" %} -
-

Could also have 2 or 6.

-

In addition to your goal, find out your users' goals. What do they want to know or do that supports your - mission? Use these headings to show those.

+
+ Alt text +
+

Could also have 2 or 6.

+

+ In addition to your goal, find out your users' goals. What do they want to know or do that supports your + mission? Use these headings to show those. +

+
-
\ No newline at end of file diff --git a/_includes/menu.html b/_includes/menu.html index 4738fcb77..5d449023d 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -18,7 +18,7 @@