diff --git a/Makefile b/Makefile index eaa8c63d553..e1c37a66d90 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ lint_asset_bundle_size: ## Lints JavaScript and CSS compiled bundle size @# and you have no options to split that from the common bundles. If you need to increase this @# budget and accept the fact that this will force end-users to endure longer load times, you @# should set the new budget to within a few thousand bytes of the production-compiled size. - find app/assets/builds/application.css -size -185000c | grep . + find app/assets/builds/application.css -size -105000c | grep . find public/packs/application-*.digested.js -size -5000c | grep . lint_migrations: diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 6015355f074..86437370173 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -3,5 +3,3 @@ @forward 'uswds'; @forward 'design-system-waiting-room'; @forward 'components'; -@forward 'uswds-utilities'; -@forward 'utilities'; diff --git a/app/assets/stylesheets/utilities.css.scss b/app/assets/stylesheets/utilities.css.scss new file mode 100644 index 00000000000..724dbfd7338 --- /dev/null +++ b/app/assets/stylesheets/utilities.css.scss @@ -0,0 +1,3 @@ +@forward 'uswds-core'; +@forward 'uswds-utilities'; +@forward 'utilities'; diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 2ec6e6e4247..648cf73d3a0 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -20,8 +20,9 @@ <% end %> <%= preload_link_tag font_path('public-sans/PublicSans-Bold.woff2') %> <%= preload_link_tag font_path('public-sans/PublicSans-Regular.woff2') %> - <%= render_stylesheet_once_tags %> <%= stylesheet_link_tag 'application', nopush: false %> + <%= render_stylesheet_once_tags %> + <%= stylesheet_link_tag 'utilities', nopush: false %> <%= stylesheet_link_tag 'print', media: :print, preload_links_header: false %> <%= csrf_meta_tags %> diff --git a/app/views/layouts/component_preview.html.erb b/app/views/layouts/component_preview.html.erb index d5662395c30..90344bed5f9 100644 --- a/app/views/layouts/component_preview.html.erb +++ b/app/views/layouts/component_preview.html.erb @@ -2,8 +2,9 @@ Component Preview + <%= stylesheet_link_tag 'application', nopush: false %> <%= render_stylesheet_once_tags %> - <%= stylesheet_link_tag 'application', media: 'all' %> + <%= stylesheet_link_tag 'utilities', nopush: false %> <% if params.dig(:lookbook, :display, :form) == true %> diff --git a/app/views/saml_idp/shared/saml_post_binding.html.erb b/app/views/saml_idp/shared/saml_post_binding.html.erb index ae607743875..faa56cf208b 100644 --- a/app/views/saml_idp/shared/saml_post_binding.html.erb +++ b/app/views/saml_idp/shared/saml_post_binding.html.erb @@ -7,8 +7,9 @@ document.documentElement.classList.replace('no-js', 'js'); <% end %> <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'application', media: 'all' %> + <%= stylesheet_link_tag 'application', nopush: false %> <%= render_stylesheet_once_tags %> + <%= stylesheet_link_tag 'utilities', nopush: false %>