From bfe50314f6f2efd7ee2df90f382b99377b4c9eb0 Mon Sep 17 00:00:00 2001 From: Alex Humphries Date: Wed, 10 Dec 2025 11:29:02 -0500 Subject: [PATCH 1/4] Fix variable font rendering --- .../footer-menu/footer-menu.vue | 1 - .../site-sub-header/site-sub-header.vue | 5 -- src/styles/common-typography-styles.scss | 52 +++++++++---------- src/styles/ux-variables.scss | 4 +- 4 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/iss-components/footer-menu/footer-menu.vue b/src/iss-components/footer-menu/footer-menu.vue index 3fb0bd72..738c0507 100644 --- a/src/iss-components/footer-menu/footer-menu.vue +++ b/src/iss-components/footer-menu/footer-menu.vue @@ -63,7 +63,6 @@ export default { .footer-menu-container { display: flex; border-top: solid 0.125rem #d3d3d3; - font-family: $font-family-urbanist-regular-400; @include media-breakpoint-up(xs) { padding: 1rem 0 1.25rem 0; // Heritage 1.250rem 0 diff --git a/src/iss-components/site-sub-header/site-sub-header.vue b/src/iss-components/site-sub-header/site-sub-header.vue index f2d6796d..b58be168 100644 --- a/src/iss-components/site-sub-header/site-sub-header.vue +++ b/src/iss-components/site-sub-header/site-sub-header.vue @@ -177,12 +177,7 @@ p { } } -.subheader-primary { - font-family: $font-family-urbanist-regular-400; -} - .subheader-secondary { - font-family: $font-family-urbanist-regular-400; p { margin-bottom: 1.25rem; color: #525656; diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss index b12a0ac8..f7790a78 100644 --- a/src/styles/common-typography-styles.scss +++ b/src/styles/common-typography-styles.scss @@ -73,55 +73,55 @@ caption, // Urbanist Fonts @font-face { - font-family: "UrbanistRegular"; + font-family: "Urbanist"; src: - url("@/assets/fonts/Urbanist-Regular.woff") format("woff2"), - url("@/assets/fonts/Urbanist-Regular.woff2") format("woff"); - font-weight: normal; + url("@/assets/fonts/Urbanist-Regular.woff2") format("woff2"), + url("@/assets/fonts/Urbanist-Regular.woff") format("woff"); + font-weight: 400; font-style: normal; } @font-face { - font-family: "UrbanistSemibold"; + font-family: "Urbanist"; src: - url("@/assets/fonts/Urbanist-SemiBold.woff") format("woff2"), - url("@/assets/fonts/Urbanist-SemiBold.woff2") format("woff"); - font-weight: normal; + url("@/assets/fonts/Urbanist-SemiBold.woff2") format("woff2"), + url("@/assets/fonts/Urbanist-SemiBold.woff") format("woff"); + font-weight: 600; font-style: normal; } @font-face { - font-family: "UrbanistBold"; + font-family: "Urbanist"; src: - url("@/assets/fonts/Urbanist-Bold.woff") format("woff2"), - url("@/assets/fonts/Urbanist-Bold.woff2") format("woff"); - font-weight: normal; + url("@/assets/fonts/Urbanist-Bold.woff2") format("woff2"), + url("@/assets/fonts/Urbanist-Bold.woff") format("woff"); + font-weight: 700; font-style: normal; } @font-face { - font-family: "UrbanistExtraBold"; + font-family: "Urbanist"; src: - url("@/assets/fonts/Urbanist-ExtraBold.woff") format("woff2"), - url("@/assets/fonts/Urbanist-ExtraBold.woff2") format("woff"); - font-weight: normal; + url("@/assets/fonts/Urbanist-ExtraBold.woff2") format("woff2"), + url("@/assets/fonts/Urbanist-ExtraBold.woff") format("woff"); + font-weight: 800; font-style: normal; } @font-face { - font-family: "UrbanistMedium_Italic"; + font-family: "Urbanist"; src: - url("@/assets/fonts/Urbanist-MediumItalic.woff") format("woff2"), - url("@/assets/fonts/Urbanist-MediumItalic.woff2") format("woff"); - font-weight: normal; - font-style: normal; + url("@/assets/fonts/Urbanist-MediumItalic.woff2") format("woff2"), + url("@/assets/fonts/Urbanist-MediumItalic.woff") format("woff"); + font-weight: 500; + font-style: italic; } @font-face { - font-family: "UrbanistBold_Italic"; + font-family: "Urbanist"; src: - url("@/assets/fonts/Urbanist-BoldItalic.woff") format("woff2"), - url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff"); - font-weight: normal; - font-style: normal; + url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff2"), + url("@/assets/fonts/Urbanist-BoldItalic.woff") format("woff"); + font-weight: 700; + font-style: italic; } \ No newline at end of file diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index 9608c860..d713b8ed 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -117,9 +117,7 @@ $theme-colors: ( $body-color: $gray-600; //Fonts -$font-family-urbanist-regular-400: UrbanistRegular, Roboto, Arial, sans-serif; -$font-family-urbanist-semibold-600: UrbanistSemibold, Roboto, Arial, sans-serif; -$font-family-sans-serif: $font-family-urbanist-semibold-600; +$font-family-sans-serif: Urbanist, Roboto, Arial, sans-serif; $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; // stylelint-enable value-keyword-case From f03e3277206430c3f03dd919ba77576c5e42f89c Mon Sep 17 00:00:00 2001 From: Bill Richardson Date: Wed, 10 Dec 2025 13:27:18 -0500 Subject: [PATCH 2/4] remove loader in continue button remove commented lines remove client overrides that dont appear to match Heritage for client --- src/styles/client-customizations.scss | 50 ------------------- src/styles/common-error-styles.scss | 17 +------ src/ux-components/button-main/button-main.vue | 30 ----------- 3 files changed, 1 insertion(+), 96 deletions(-) diff --git a/src/styles/client-customizations.scss b/src/styles/client-customizations.scss index d74a4911..b384870f 100644 --- a/src/styles/client-customizations.scss +++ b/src/styles/client-customizations.scss @@ -8,14 +8,9 @@ $accent-fill: #e6f1f3; // Calendar background $accent-color: #09748b; $link: #09748b; - $button-color: #a9e3e9; - $button-text-color: #181643; $svg-fill-color: '%2309748b'; // Color of calendar icon. Place HEX code *after* %23 $progress-bar-color: #181643; - //Variables - --iss-loader-color: #{$button-text-color}; - svg, .modal-text { fill: $accent-color; @@ -30,51 +25,6 @@ a.new-window-link { color: $link; } - - .btn { - &.btn-override[aria-disabled="false"]:not(.form-test-invalid) { - &.btn-primary { - background: $button-color; - color: $button-text-color; - } - - &:focus-visible { - background: $button-color; - color: $button-text-color; - box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $button-color; - } - - } - } - } - - &.modal-open { - .modal { - .modal-body { - .btn { - &.btn-override[aria-disabled="false"]:not(.form-test-invalid) { - &.btn-primary { - background: $button-color; - color: $button-text-color; - } - - &:focus-visible { - background: $button-color; - color: $button-text-color; - box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $button-color; - } - - } - } - } - - .modal-footer { - .btn:not(.navigation-link) { - background: $button-color; - color: $button-text-color; - } - } - } } .progress-bar-container { diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss index a064052b..774cb05d 100644 --- a/src/styles/common-error-styles.scss +++ b/src/styles/common-error-styles.scss @@ -1,5 +1,5 @@ - @import "@/styles/ux-variables-svg-strings.scss"; + html { .has-error { @@ -202,24 +202,9 @@ html { } .form-test-invalid { - - // Disable Gray coloring to match Heritage &.btn.btn-primary { - //color: $gray-600; - //background: $gray-200; cursor: pointer; pointer-events: all; } - - //&.btn.btn-primary:hover, - //&.btn.btn-primary:focus { - //color: $gray-600; - //background: $gray-200; - //box-shadow: none; - //} - - //&.btn.btn-primary:focus-visible { - // box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $gray-700; - //} } } \ No newline at end of file diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue index 4ffa2f57..6000a9f2 100644 --- a/src/ux-components/button-main/button-main.vue +++ b/src/ux-components/button-main/button-main.vue @@ -5,25 +5,15 @@ :class="[ isPrimary ? 'btn-primary' : 'btn-secondary', isFloat ? 'float-end' : '', - isLoaderDisplayed ? 'has-loader' : '', ]" @click="clicked"> {{ buttonText }} -