From 2aba197f06a60bbe365728e8c5722d27461a878b Mon Sep 17 00:00:00 2001 From: Natasha Pierre-Louis Date: Mon, 24 Jun 2024 21:54:51 -0600 Subject: [PATCH 1/5] First attempt at fixing flash of unstyled font --- _data/assetPaths.json | 66 ++------------------------ _includes/components/head.html | 2 + _includes/theme/styles/_templates.scss | 2 + 3 files changed, 8 insertions(+), 62 deletions(-) diff --git a/_data/assetPaths.json b/_data/assetPaths.json index f58f96aa..eda016fc 100644 --- a/_data/assetPaths.json +++ b/_data/assetPaths.json @@ -21,7 +21,7 @@ "check_circle.svg": "/assets/assets/check_circle-FKYRF36F.svg", "checkbox-indeterminate.svg": "/assets/assets/checkbox-indeterminate-HJACJSU3.svg", "checkbox-indeterminate-alt.svg": "/assets/assets/checkbox-indeterminate-alt-SXGAHOOI.svg", - "close.svg": "/assets/images/close-x.svg", + "close.svg": "/assets/assets/close-D6X4FKTZ.svg", "correct8.svg": "/assets/assets/correct8-BW6WT7U2.svg", "correct8-alt.svg": "/assets/assets/correct8-alt-M4H3GT6Q.svg", "delna.webp": "/assets/assets/delna-Y7FFIQ4T.webp", @@ -37,7 +37,7 @@ "frank.webp": "/assets/assets/frank-WEGTXKFN.webp", "header-bottom-border.webp": "/assets/assets/header-bottom-border-K2INIIYM.webp", "hero.jpg": "/assets/assets/hero-OXUBFI7L.jpg", - "homepage-gradient-bg.jpg": "/assets/images/homepage-gradient-bg-mobile.jpg", + "homepage-gradient-bg.jpg": "/assets/assets/homepage-gradient-bg-L552LDA4.jpg", "homepage-gradient-bg-mobile.jpg": "/assets/assets/homepage-gradient-bg-mobile-7NX7I3DV.jpg", "impact-report_pdf-icon.webp": "/assets/assets/impact-report_pdf-icon-ARH2FAXH.webp", "info.svg": "/assets/assets/info-TBKQSD4V.svg", @@ -83,66 +83,8 @@ "tts-inclusive-grid-map.svg": "/assets/assets/tts-inclusive-grid-map-D5DPHQNA.svg", "unfold_more.svg": "/assets/assets/unfold_more-WL443JWS.svg", "warning.svg": "/assets/assets/warning-5OR6W6GJ.svg", - "merriweathe": "/assets/fonts/merriweather", - "poppin": "/assets/fonts/poppins", - "public": "/assets/fonts/public-sans", - "roboto": "/assets/fonts/roboto-mono", - "source-sans": "/assets/fonts/source-sans-pro", - "10x.png": "/assets/images/10x-logo.png", - "10x.webp": "/assets/images/10x-logo.webp", - "10x_og_imag.png": "/assets/images/10x_og_image.png", - "access-to-data.png": "/assets/images/access-to-data-icon.png", - "access-to-data.webp": "/assets/images/access-to-data-icon.webp", - "benefits-eligibility.png": "/assets/images/benefits-eligibility-icon.png", - "benefits-eligibility.webp": "/assets/images/benefits-eligibility-icon.webp", - "cloud_go.png": "/assets/images/cloud_gov.png", - "current-report-icon.png": "/assets/images/current-report-icon-solid.png", - "current-report-icon.svg": "/assets/images/current-report-icon-floated.svg", - "current-report.svg": "/assets/images/current-report-icon.svg", - "customer-experience.png": "/assets/images/customer-experience-icon.png", - "customer-experience.webp": "/assets/images/customer-experience-icon.webp", - "digitalgov.png": "/assets/images/digitalgov-logo.png", - "equity-project.png": "/assets/images/equity-project-icon.png", - "equity-project.webp": "/assets/images/equity-project-icon.webp", - "external-link.svg": "/assets/images/external-link-icon.svg", - "gradient.png": "/assets/images/gradient-bg.png", - "gradient_her.png": "/assets/images/gradient_hero.png", - "gsa.svg": "/assets/images/gsa-logo.svg", - "header-bottom.png": "/assets/images/header-bottom-border.png", - "header-bottom.webp": "/assets/images/header-bottom-border.webp", - "homepage-gradient.jpg": "/assets/images/homepage-gradient-bg.jpg", - "homepage-gradient.png": "/assets/images/homepage-gradient-bg.png", - "impact": "/assets/images/impact-reports", - "left.svg": "/assets/images/left-arrow.svg", - "logo.png": "/assets/images/logo-alt.png", - "logo.svg": "/assets/images/logo-alt.svg", - "log.svg": "/assets/images/logo.svg", - "menu-close.png": "/assets/images/menu-close-X.png", - "menu-close.webp": "/assets/images/menu-close-X.webp", - "menu.svg": "/assets/images/menu-icon.svg", - "optimal-digital-experience.png": "/assets/images/optimal-digital-experience-icon.png", - "optimal-digital-experience.webp": "/assets/images/optimal-digital-experience-icon.webp", - "placeholder.png": "/assets/images/placeholder-icon.png", - "placeholder.svg": "/assets/images/placeholder-icon.svg", - "public-service.png": "/assets/images/public-service-icon.png", - "public-service.webp": "/assets/images/public-service-icon.webp", - "purple.svg": "/assets/images/purple-US.svg", - "science-medicine.png": "/assets/images/science-medicine-icon.png", - "science-medicine.webp": "/assets/images/science-medicine-icon.webp", - "section2-purple.png": "/assets/images/section2-purple-bg.png", - "section2-purple.svg": "/assets/images/section2-purple-bg.svg", - "section2-purple.webp": "/assets/images/section2-purple-bg.webp", - "security-project.png": "/assets/images/security-project-icon.png", - "security-project.webp": "/assets/images/security-project-icon.webp", - "sewer": "/assets/images/sewer-spills", - "sprit.svg": "/assets/images/sprite.svg", - "technology.svg": "/assets/images/technology-services.svg", - "tts-inclusive-grid.png": "/assets/images/tts-inclusive-grid-map.png", - "tts-inclusive-grid.svg": "/assets/images/tts-inclusive-grid-map.svg", - "uswd": "/assets/images/uswds", "app.js": "/assets/js/app-EDZES2YK.js", "app.map": "/assets/js/app-EDZES2YK.js.map", - "index.css": "/assets/styles/index-RAJAX37S.css", - "index.map": "/assets/styles/index-RAJAX37S.css.map", - "j": "/assets/uswds/js" + "index.css": "/assets/styles/index-5YHVULMU.css", + "index.map": "/assets/styles/index-5YHVULMU.css.map" } \ No newline at end of file diff --git a/_includes/components/head.html b/_includes/components/head.html index 9728652c..4e785b68 100644 --- a/_includes/components/head.html +++ b/_includes/components/head.html @@ -25,6 +25,8 @@ + + diff --git a/_includes/theme/styles/_templates.scss b/_includes/theme/styles/_templates.scss index 086dfe86..21cf6be0 100644 --- a/_includes/theme/styles/_templates.scss +++ b/_includes/theme/styles/_templates.scss @@ -4,6 +4,8 @@ $homepage-deep-blue: #160449; html { scroll-behavior: smooth; + visibility: visible; + opacity: 1; } body { From 05d52f831c278722e28837a1be9080d0079c30e1 Mon Sep 17 00:00:00 2001 From: Natasha Pierre-Louis Date: Mon, 24 Jun 2024 23:23:57 -0600 Subject: [PATCH 2/5] Moved the html rule to the end of the stylesheet --- _data/assetPaths.json | 4 ++-- _includes/theme/styles/_templates.scss | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/_data/assetPaths.json b/_data/assetPaths.json index eda016fc..af819394 100644 --- a/_data/assetPaths.json +++ b/_data/assetPaths.json @@ -85,6 +85,6 @@ "warning.svg": "/assets/assets/warning-5OR6W6GJ.svg", "app.js": "/assets/js/app-EDZES2YK.js", "app.map": "/assets/js/app-EDZES2YK.js.map", - "index.css": "/assets/styles/index-5YHVULMU.css", - "index.map": "/assets/styles/index-5YHVULMU.css.map" + "index.css": "/assets/styles/index-GFSPTD5P.css", + "index.map": "/assets/styles/index-GFSPTD5P.css.map" } \ No newline at end of file diff --git a/_includes/theme/styles/_templates.scss b/_includes/theme/styles/_templates.scss index 21cf6be0..b5739503 100644 --- a/_includes/theme/styles/_templates.scss +++ b/_includes/theme/styles/_templates.scss @@ -2,12 +2,6 @@ $homepage-deep-blue: #160449; -html { - scroll-behavior: smooth; - visibility: visible; - opacity: 1; -} - body { color: color("violet-90"); font-size: size('body', 8); @@ -1431,3 +1425,12 @@ input[type="search"]::-webkit-search-cancel-button { background-image: url(../images/menu-close-X.webp); cursor: pointer; } + + +/* This rule contains a fix for the flash of unstyled fonts. It must remain at the end of this stylesheet */ + +html { + scroll-behavior: smooth; + visibility: visible; + opacity: 1; +} \ No newline at end of file From a62ac56de83d936080c41de6f47bd15b1dbd1e58 Mon Sep 17 00:00:00 2001 From: Natasha Pierre-Louis Date: Tue, 25 Jun 2024 04:38:25 -0600 Subject: [PATCH 3/5] Fixed columns in mobile footer --- _data/assetPaths.json | 4 ++-- _includes/theme/styles/_templates.scss | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/_data/assetPaths.json b/_data/assetPaths.json index af819394..f5ffaae4 100644 --- a/_data/assetPaths.json +++ b/_data/assetPaths.json @@ -85,6 +85,6 @@ "warning.svg": "/assets/assets/warning-5OR6W6GJ.svg", "app.js": "/assets/js/app-EDZES2YK.js", "app.map": "/assets/js/app-EDZES2YK.js.map", - "index.css": "/assets/styles/index-GFSPTD5P.css", - "index.map": "/assets/styles/index-GFSPTD5P.css.map" + "index.css": "/assets/styles/index-PVF35CMC.css", + "index.map": "/assets/styles/index-PVF35CMC.css.map" } \ No newline at end of file diff --git a/_includes/theme/styles/_templates.scss b/_includes/theme/styles/_templates.scss index b5739503..83123982 100644 --- a/_includes/theme/styles/_templates.scss +++ b/_includes/theme/styles/_templates.scss @@ -106,8 +106,22 @@ h2, } .usa-identifier__required-links-list { - column-count: 5; - -moz-column-count: 5; + column-count: 1; + -moz-column-count: 1; + + @include at-media("tablet") { + column-count: 5; + -moz-column-count: 5; + } +} + +.usa-identifier__required-link, +.usa-identifier__required-link.usa-link { + padding: units(1) 0; + + @include at-media("tablet") { + padding: 0; + } } .usa-identifier__container, From c431c3d93ec5117c1ac683eb9949adcc79a22905 Mon Sep 17 00:00:00 2001 From: ethangardner Date: Wed, 26 Jun 2024 09:50:56 -0400 Subject: [PATCH 4/5] undo opacity setting on html tag --- _includes/components/head.html | 2 -- _includes/theme/styles/_templates.scss | 13 ++++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/_includes/components/head.html b/_includes/components/head.html index 4e785b68..2829deeb 100644 --- a/_includes/components/head.html +++ b/_includes/components/head.html @@ -26,8 +26,6 @@ - - {% capture js %} diff --git a/_includes/theme/styles/_templates.scss b/_includes/theme/styles/_templates.scss index 83123982..9aae0dd0 100644 --- a/_includes/theme/styles/_templates.scss +++ b/_includes/theme/styles/_templates.scss @@ -2,6 +2,10 @@ $homepage-deep-blue: #160449; +html { + scroll-behavior: smooth; +} + body { color: color("violet-90"); font-size: size('body', 8); @@ -1438,13 +1442,4 @@ input[type="search"]::-webkit-search-cancel-button { background-repeat: no-repeat; background-image: url(../images/menu-close-X.webp); cursor: pointer; -} - - -/* This rule contains a fix for the flash of unstyled fonts. It must remain at the end of this stylesheet */ - -html { - scroll-behavior: smooth; - visibility: visible; - opacity: 1; } \ No newline at end of file From 03fc36e9537f12f0e8c80b748fefedca3f17c111 Mon Sep 17 00:00:00 2001 From: ethangardner Date: Wed, 26 Jun 2024 10:02:50 -0400 Subject: [PATCH 5/5] update hidden lcp image to use picture element and a partial. add cache header for font files --- 404.html | 3 +-- _data/assetPaths.json | 4 ++-- _includes/components/gradient-bg-image.html | 5 +++++ _includes/components/gradient-hero-banner.html | 5 +---- _includes/components/head.html | 2 +- _includes/components/header.html | 6 +++--- _includes/layouts/about-sub-page.html | 5 +---- _includes/layouts/home.html | 5 +---- federalist.json | 5 +++++ 9 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 _includes/components/gradient-bg-image.html diff --git a/404.html b/404.html index f8faa07b..293d3774 100644 --- a/404.html +++ b/404.html @@ -12,8 +12,7 @@