From f86767a3d7c52e4e54b254d2abdf75e42d1f2882 Mon Sep 17 00:00:00 2001 From: Ximena Kilroe Date: Mon, 9 Sep 2024 15:22:44 -0400 Subject: [PATCH 1/2] Fixes header font family --- _data/assetPaths.json | 6 +++--- styles/styles.scss | 1 - styles/tts-custom-styles.scss | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/_data/assetPaths.json b/_data/assetPaths.json index c38c55d6..51fd77f2 100644 --- a/_data/assetPaths.json +++ b/_data/assetPaths.json @@ -3,6 +3,6 @@ "admin.map": "/assets/js/admin-77FHK54G.js.map", "app.js": "/assets/js/app-U5OIPSUD.js", "app.map": "/assets/js/app-U5OIPSUD.js.map", - "styles.css": "/assets/styles/styles-JK64M7TT.css", - "styles.map": "/assets/styles/styles-JK64M7TT.css.map" -} + "styles.css": "/assets/styles/styles-FUAC23XZ.css", + "styles.map": "/assets/styles/styles-FUAC23XZ.css.map" +} \ No newline at end of file diff --git a/styles/styles.scss b/styles/styles.scss index 0933dc2e..57f482dc 100644 --- a/styles/styles.scss +++ b/styles/styles.scss @@ -2,7 +2,6 @@ $theme-show-notifications: false, $theme-font-path: '../node_modules/@uswds/uswds/dist/fonts', $theme-image-path: '../node_modules/@uswds/uswds/dist/img', - $theme-font-type-sans: 'public-sans' ); @forward 'uswds'; diff --git a/styles/tts-custom-styles.scss b/styles/tts-custom-styles.scss index b6c9f9df..ea437921 100644 --- a/styles/tts-custom-styles.scss +++ b/styles/tts-custom-styles.scss @@ -98,7 +98,7 @@ h2, h3, h4, h5 { - font-family: $theme-font-type-sans !important; + font-family: "Merriweather Web", "Georgia", "Cambria", "Times New Roman", "Times", serif !important; } .usa-identifier__logos img { From ae8c5612629c320f74feba45495a80495d16a7fb Mon Sep 17 00:00:00 2001 From: Wesley Dean Date: Mon, 9 Sep 2024 20:00:35 +0000 Subject: [PATCH 2/2] [MegaLinter] Apply linters fixes --- _data/assetPaths.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/assetPaths.json b/_data/assetPaths.json index 51fd77f2..54ec1fe1 100644 --- a/_data/assetPaths.json +++ b/_data/assetPaths.json @@ -5,4 +5,4 @@ "app.map": "/assets/js/app-U5OIPSUD.js.map", "styles.css": "/assets/styles/styles-FUAC23XZ.css", "styles.map": "/assets/styles/styles-FUAC23XZ.css.map" -} \ No newline at end of file +}