diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index de1fd9dfb91..521b6d60b16 100644 --- 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 new file mode 100644 index 00000000000..8174446d892 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Black.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-Black.woff2 b/app/assets/fonts/public-sans/PublicSans-Black.woff2 new file mode 100644 index 00000000000..656549ff192 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Black.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff b/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff new file mode 100644 index 00000000000..4b3f2495856 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff2 new file mode 100644 index 00000000000..a77821ca359 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-BlackItalic.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-Bold.woff b/app/assets/fonts/public-sans/PublicSans-Bold.woff new file mode 100644 index 00000000000..a330a13dcf0 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Bold.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-Bold.woff2 b/app/assets/fonts/public-sans/PublicSans-Bold.woff2 new file mode 100644 index 00000000000..eaffd02816e Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Bold.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff b/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff new file mode 100644 index 00000000000..d03f7ca2295 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff2 new file mode 100644 index 00000000000..bdd712d81eb Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-BoldItalic.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff b/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff new file mode 100644 index 00000000000..33ceeb2fa59 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff2 b/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff2 new file mode 100644 index 00000000000..0caaa499cc2 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ExtraBold.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff b/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff new file mode 100644 index 00000000000..a89787fd384 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff2 new file mode 100644 index 00000000000..774fe32b0a3 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ExtraBoldItalic.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff b/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff new file mode 100644 index 00000000000..7ae600def7e Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff2 b/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff2 new file mode 100644 index 00000000000..219329aba5b Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ExtraLight.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff b/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff new file mode 100644 index 00000000000..30b9103786e Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff2 new file mode 100644 index 00000000000..f0e21c92195 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ExtraLightItalic.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-Italic.woff b/app/assets/fonts/public-sans/PublicSans-Italic.woff new file mode 100644 index 00000000000..319cb1e8939 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Italic.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-Italic.woff2 b/app/assets/fonts/public-sans/PublicSans-Italic.woff2 new file mode 100644 index 00000000000..a96fa977705 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Italic.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-Light.woff b/app/assets/fonts/public-sans/PublicSans-Light.woff new file mode 100644 index 00000000000..740c94d3387 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Light.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-Light.woff2 b/app/assets/fonts/public-sans/PublicSans-Light.woff2 new file mode 100644 index 00000000000..87fc6df1e36 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Light.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-LightItalic.woff b/app/assets/fonts/public-sans/PublicSans-LightItalic.woff new file mode 100644 index 00000000000..9172ccc83a8 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-LightItalic.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-LightItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-LightItalic.woff2 new file mode 100644 index 00000000000..bc9b5f7edd7 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-LightItalic.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-Medium.woff b/app/assets/fonts/public-sans/PublicSans-Medium.woff new file mode 100644 index 00000000000..47a26564c40 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Medium.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-Medium.woff2 b/app/assets/fonts/public-sans/PublicSans-Medium.woff2 new file mode 100644 index 00000000000..5896b823bdf Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Medium.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff b/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff new file mode 100644 index 00000000000..d0eaa44d398 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff2 new file mode 100644 index 00000000000..0314b97c16e Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-MediumItalic.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-Regular.woff b/app/assets/fonts/public-sans/PublicSans-Regular.woff new file mode 100644 index 00000000000..8c1da26dbe4 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Regular.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-Regular.woff2 b/app/assets/fonts/public-sans/PublicSans-Regular.woff2 new file mode 100644 index 00000000000..5f5fcd86111 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Regular.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-SemiBold.woff b/app/assets/fonts/public-sans/PublicSans-SemiBold.woff new file mode 100644 index 00000000000..7c530b68836 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-SemiBold.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-SemiBold.woff2 b/app/assets/fonts/public-sans/PublicSans-SemiBold.woff2 new file mode 100644 index 00000000000..14e63ab7528 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-SemiBold.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff b/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff new file mode 100644 index 00000000000..ea23cad8b31 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff2 new file mode 100644 index 00000000000..77447b4feb7 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-SemiBoldItalic.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-Thin.woff b/app/assets/fonts/public-sans/PublicSans-Thin.woff new file mode 100644 index 00000000000..74d7727bd67 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Thin.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-Thin.woff2 b/app/assets/fonts/public-sans/PublicSans-Thin.woff2 new file mode 100644 index 00000000000..bdc7449f203 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-Thin.woff2 differ diff --git a/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff b/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff new file mode 100644 index 00000000000..04dbf4147a6 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff differ diff --git a/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff2 b/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff2 new file mode 100644 index 00000000000..b8b1fbb51a9 Binary files /dev/null and b/app/assets/fonts/public-sans/PublicSans-ThinItalic.woff2 differ diff --git a/app/assets/stylesheets/variables/_vendor.scss b/app/assets/stylesheets/variables/_vendor.scss index a901f701388..d1bb16c2ed2 100644 --- 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 index 43512512d7a..18b3f91f379 100644 --- 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' %>