18F · aduth · Mar 21, 2022 · Mar 18, 2022 · Mar 18, 2022 · Mar 18, 2022
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,4 +1,5 @@
 //= link_tree ../images
+//= link_tree ../fonts
 
 //= link es5-shim.min.js
 //= link html5shiv.js

diff --git a/app/assets/fonts/public-sans/PublicSans-Black.woff b/app/assets/fonts/public-sans/PublicSans-Black.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-Black.woff2 b/app/assets/fonts/public-sans/PublicSans-Black.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff b/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-Bold.woff b/app/assets/fonts/public-sans/PublicSans-Bold.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-Bold.woff2 b/app/assets/fonts/public-sans/PublicSans-Bold.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff b/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff b/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff2 b/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff b/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff b/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff2 b/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff b/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-Italic.woff b/app/assets/fonts/public-sans/PublicSans-Italic.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-Italic.woff2 b/app/assets/fonts/public-sans/PublicSans-Italic.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-Light.woff b/app/assets/fonts/public-sans/PublicSans-Light.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-Light.woff2 b/app/assets/fonts/public-sans/PublicSans-Light.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-LightItalic.woff b/app/assets/fonts/public-sans/PublicSans-LightItalic.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-LightItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-LightItalic.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-Medium.woff b/app/assets/fonts/public-sans/PublicSans-Medium.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-Medium.woff2 b/app/assets/fonts/public-sans/PublicSans-Medium.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff b/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-Regular.woff b/app/assets/fonts/public-sans/PublicSans-Regular.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-Regular.woff2 b/app/assets/fonts/public-sans/PublicSans-Regular.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-SemiBold.woff b/app/assets/fonts/public-sans/PublicSans-SemiBold.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-SemiBold.woff2 b/app/assets/fonts/public-sans/PublicSans-SemiBold.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff b/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-Thin.woff b/app/assets/fonts/public-sans/PublicSans-Thin.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-Thin.woff2 b/app/assets/fonts/public-sans/PublicSans-Thin.woff2
diff --git a/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff b/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff
diff --git a/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff2
diff --git a/app/assets/stylesheets/variables/_vendor.scss b/app/assets/stylesheets/variables/_vendor.scss
@@ -1,5 +1,5 @@
 $theme-body-font-size: 'sm';
-$theme-font-path: 'identity-style-guide/dist/assets/fonts';
+$theme-font-path: '.';
 $theme-image-path: 'identity-style-guide/dist/assets/img';
 $theme-global-border-box-sizing: true;
 $theme-global-link-styles: true;

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
@@ -26,8 +26,8 @@
   <%= backwards_compatible_javascript_tag do %>
     document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/, 'js');
   <% end %>
-  <%= preload_link_tag font_url('identity-style-guide/dist/assets/fonts/public-sans/PublicSans-Bold.woff2') %>
-  <%= preload_link_tag font_url('identity-style-guide/dist/assets/fonts/public-sans/PublicSans-Regular.woff2') %>
+  <%= preload_link_tag font_url('public-sans/PublicSans-Bold.woff2') %>
+  <%= preload_link_tag font_url('public-sans/PublicSans-Regular.woff2') %>
   <%= stylesheet_link_tag 'application', media: 'all' %>
   <!--[if IE 8]>
   <%= javascript_include_tag_without_preload 'es5-shim.min' %>

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
@@ -4,7 +4,10 @@
 Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
+Rails.application.config.assets.paths.push(
+  'node_modules',
+  'node_modules/identity-style-guide/dist/assets/fonts',
+)
 
 # Fix sassc sometimes segfaulting
 Rails.application.config.assets.configure do |env|