Various cleanup and tweaks.

- Remove unused files and try to document more of the new setup.
- Reorganize and cleanup frontend assets.
- Fix header icons wrapping to next line by themselves. Change so the
  icon always sticks to the last word.
- Fixes for link `:visited` color bugs not working properly for nested
  SVG icons in Safari.
- Various responsive style tweaks and improvements.
- Fix large SVG logo flashing on page load/page change.
- Add page layout to terms page, so it's more linkable.
- Hook up favicons.
- Fix contact form submission and setup for easier testing.
- Remove middleman livereload, since it wasn't working and not sure it's
  worth messing with given the infrequency of development.

Author: GUI

.dockerignore

@@ -1,3 +1,4 @@
-.git
-tmp
-node_modules
+/.git
+/build
+/node_modules
+/tmp

Gemfile

@@ -4,7 +4,6 @@ ruby "~> 3.4.0"
 
 # Middleman Gems
 gem "middleman", "~> 4.6.0"
-gem "middleman-livereload", "~> 3.4.6"
 
 # GitHub-flavored markdown.
 gem "kramdown-parser-gfm", "~> 1.1.0"
@@ -27,4 +26,5 @@ gem "rake", "~> 13.0"
 # For making API calls to generate docs.
 gem "rest-client", "~> 2.1.0"
 
+# Use Vite for assets.
 gem "vite_padrino", "~> 3.0.0"

Gemfile.lock

@@ -30,11 +30,7 @@ GEM
     dotenv (3.1.8)
     drb (2.2.1)
     dry-cli (1.2.0)
-    em-websocket (0.5.3)
-      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0)
     erubi (1.13.1)
-    eventmachine (1.2.7)
     execjs (2.10.0)
     fast_blank (1.0.1)
     fastimage (2.4.0)
@@ -51,7 +47,6 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    http_parser.rb (0.8.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     kramdown (2.5.1)
@@ -98,10 +93,6 @@ GEM
       toml
       uglifier (>= 3, < 5)
       webrick
-    middleman-livereload (3.4.7)
-      em-websocket (~> 0.5.1)
-      middleman-core (>= 3.3)
-      rack-livereload (~> 0.3.15)
     middleman-syntax (3.5.0)
       middleman-core (>= 3.2)
       rouge (~> 3.2)
@@ -122,8 +113,6 @@ GEM
     parslet (2.0.0)
     public_suffix (6.0.1)
     rack (3.1.13)
-    rack-livereload (0.3.17)
-      rack
     rack-proxy (0.7.7)
       rack
     rackup (2.2.1)
@@ -174,7 +163,6 @@ DEPENDENCIES
   kramdown-parser-gfm (~> 1.1.0)
   middleman (~> 4.6.0)
   middleman-alias (~> 0.0.17)
-  middleman-livereload (~> 3.4.6)
   middleman-syntax (~> 3.5.0)
   multi_json (~> 1.15.0)
   rake (~> 13.0)

config.rb

@@ -5,35 +5,31 @@
 ###
 
 # Per-page layout changes:
-#
+
 # With no layout
 page "/*.xml", layout: false
 page "/*.json", layout: false
 page "/*.txt", layout: false
 
-# With alternative layout
-# page "/path/to/file.html", layout: :otherlayout
-
-# Proxy pages (http://middlemanapp.com/basics/dynamic-pages/)
-# proxy "/this-page-has-no-template.html", "/template-file.html", locals: {
-#  which_fake_page: "Rendering a fake page with a local variable" }
-
+# Disable directory index paths for the 404 page.
 page "/404.html", :directory_index => false
 
 # General configuration
 
-
+# Use Vite for assets.
 if build?
+  # In build mode, force the Vite Ruby integration into production mode so the
+  # tag helpers know where to look for the built assets.
   ENV["RACK_ENV"] = "production"
 end
 activate :external_pipeline,
   name: :vite,
   command: build? ? "bundle exec vite build --clobber" : "pnpm exec vite build --watch --mode development",
   source: "tmp/vite",
   latency: 1
-activate :directory_indexes
-activate :syntax
-
+# Middleman's file watcher seems to trigger on directory changes when watching
+# the vite build directory. So ignore directory changes to avoid it throwing
+# errors in local development.
 module MiddlemanWatcherViteDirectoryFix
   def file_contents_include_binary_bytes?(filename)
     if File.directory?(filename)
@@ -45,11 +41,8 @@ def file_contents_include_binary_bytes?(filename)
 end
 Middleman::Util.singleton_class.send(:prepend, MiddlemanWatcherViteDirectoryFix)
 
-set :css_dir, "assets/stylesheets"
-set :js_dir, "assets/javascripts"
-set :fonts_dir, "assets/fonts"
-set :images_dir, "assets/images"
-
+activate :directory_indexes
+activate :syntax
 
 set :markdown_engine, :kramdown
 set :markdown, {
@@ -61,9 +54,15 @@ def file_contents_include_binary_bytes?(filename)
 # Helpers
 ###
 
-# Methods defined in the helpers block are available in templates
+# Middleman is largely compatible with Padrino helpers, so use the Padrino
+# helpers for `vite_*` helpers.
 helpers VitePadrino::TagHelpers
+
+# Methods defined in the helpers block are available in templates
 helpers do
+  # Vite's Padrino's helpers just pass `asset_path` a single path, but
+  # Middleman's `asset_path` expects 2 arguments to give the type and then the
+  # path. So patch for compatibility.
   def asset_path(*args)
     if args.length == 1
       super(File.extname(args.first).delete_prefix(".").to_sym, args.first)
@@ -86,15 +85,6 @@ def breadcrumbs_trail
   end
 end
 
-# Build-specific configuration
-configure :build do
-  # Enable cache buster
-  # activate :asset_hash, :ignore => [
-  #   # Don't cache-bust the Swagger throbber.gif, since it's a hardcoded path.
-  #   %r{throbber.gif},
-  # ]
-end
-
 # Set default API key for local development.
 if !ENV["DOCS_API_KEY"] || ENV["DOCS_API_KEY"].to_s.empty?
   ENV["DOCS_API_KEY"] = "Rr247zstse9kbndOttzlhKIKnS04mW7UUXIplAqd"

config.ru

@@ -13,6 +13,6 @@ import '@fontsource/roboto/700-italic.css';
 import '@fontsource/roboto/900.css';
 import '@fontsource/roboto/900-italic.css';
 
-import '@/javascripts/_font_awesome_icons';
-import '@/lib/auto-icons';
+import '@/lib/font_awesome_icons';
+import '@/lib/auto_icons';
 import '@/lib/toc';

config/webpack/development.js

@@ -1,14 +1,12 @@
-// @import "@/stylesheets/_variables";
+@import "@/stylesheets/_variables";
 @import "bootstrap/scss/bootstrap";
 
 @import "@/nrel-app-template/css/nrel.complete";
 @import "@/nrel-app-template/css/nrel.application";
 
-@import "@/stylesheets/_shared/scaffolding";
-@import "@/stylesheets/_shared/popup";
-@import "@/stylesheets/_shared/syntax";
-@import "@/stylesheets/_shared/docs";
+@import "@/stylesheets/_base";
+@import "@/stylesheets/_docs";
+@import "@/stylesheets/_forms";
 @import "@/stylesheets/_swagger_overrides";
-
-// @import "@/stylesheets/_api_umbrella";
-@import "@/stylesheets/_nrel/developer";
+@import "@/stylesheets/_syntax";
+@import "@/stylesheets/_type";