jason/DigitalConsumer.ISS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #976 from Safelite/feature/humphries/variable-font-weight-fix

Browse source 
Fix variable font rendering
This commit is contained in:
brich1212safe 2025-12-10 15:03:36 -05:00 committed by GitHub
commit 098fd4cf23
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 27 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/iss-components/footer-menu/footer-menu.vue
View file

@ -63,7 +63,6 @@ export default {
.footer-menu-container { .footer-menu-container {
display: flex; display: flex;
border-top: solid 0.125rem #d3d3d3; border-top: solid 0.125rem #d3d3d3;
font-family: $font-family-urbanist-regular-400;
@include media-breakpoint-up(xs) { @include media-breakpoint-up(xs) {
padding: 1rem 0 1.25rem 0; // Heritage 1.250rem 0 padding: 1rem 0 1.25rem 0; // Heritage 1.250rem 0

5
src/iss-components/site-sub-header/site-sub-header.vue
View file

@ -177,12 +177,7 @@ p {
} }
} }
.subheader-primary {
font-family: $font-family-urbanist-regular-400;
}
.subheader-secondary { .subheader-secondary {
font-family: $font-family-urbanist-regular-400;
p { p {
margin-bottom: 1.25rem; margin-bottom: 1.25rem;
color: #525656; color: #525656;

52
src/styles/common-typography-styles.scss
View file

@ -73,55 +73,55 @@ caption,
// Urbanist Fonts // Urbanist Fonts
@font-face { @font-face {
font-family: "UrbanistRegular"; font-family: "Urbanist";
src: src:
url("@/assets/fonts/Urbanist-Regular.woff") format("woff2"), url("@/assets/fonts/Urbanist-Regular.woff2") format("woff2"),
url("@/assets/fonts/Urbanist-Regular.woff2") format("woff"); url("@/assets/fonts/Urbanist-Regular.woff") format("woff");
font-weight: normal; font-weight: 400;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "UrbanistSemibold"; font-family: "Urbanist";
src: src:
url("@/assets/fonts/Urbanist-SemiBold.woff") format("woff2"), url("@/assets/fonts/Urbanist-SemiBold.woff2") format("woff2"),
url("@/assets/fonts/Urbanist-SemiBold.woff2") format("woff"); url("@/assets/fonts/Urbanist-SemiBold.woff") format("woff");
font-weight: normal; font-weight: 600;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "UrbanistBold"; font-family: "Urbanist";
src: src:
url("@/assets/fonts/Urbanist-Bold.woff") format("woff2"), url("@/assets/fonts/Urbanist-Bold.woff2") format("woff2"),
url("@/assets/fonts/Urbanist-Bold.woff2") format("woff"); url("@/assets/fonts/Urbanist-Bold.woff") format("woff");
font-weight: normal; font-weight: 700;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "UrbanistExtraBold"; font-family: "Urbanist";
src: src:
url("@/assets/fonts/Urbanist-ExtraBold.woff") format("woff2"), url("@/assets/fonts/Urbanist-ExtraBold.woff2") format("woff2"),
url("@/assets/fonts/Urbanist-ExtraBold.woff2") format("woff"); url("@/assets/fonts/Urbanist-ExtraBold.woff") format("woff");
font-weight: normal; font-weight: 800;
font-style: normal; font-style: normal;
} }
@font-face { @font-face {
font-family: "UrbanistMedium_Italic"; font-family: "Urbanist";
src: src:
url("@/assets/fonts/Urbanist-MediumItalic.woff") format("woff2"), url("@/assets/fonts/Urbanist-MediumItalic.woff2") format("woff2"),
url("@/assets/fonts/Urbanist-MediumItalic.woff2") format("woff"); url("@/assets/fonts/Urbanist-MediumItalic.woff") format("woff");
font-weight: normal; font-weight: 500;
font-style: normal; font-style: italic;
} }
@font-face { @font-face {
font-family: "UrbanistBold_Italic"; font-family: "Urbanist";
src: src:
url("@/assets/fonts/Urbanist-BoldItalic.woff") format("woff2"), url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff2"),
url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff"); url("@/assets/fonts/Urbanist-BoldItalic.woff") format("woff");
font-weight: normal; font-weight: 700;
font-style: normal; font-style: italic;
} }

4
src/styles/ux-variables.scss
View file

@ -117,9 +117,7 @@ $theme-colors: (
$body-color: $gray-600; $body-color: $gray-600;
//Fonts //Fonts
$font-family-urbanist-regular-400: UrbanistRegular, Roboto, Arial, sans-serif; $font-family-sans-serif: Urbanist, 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-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", $font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
monospace; monospace;
// stylelint-enable value-keyword-case // stylelint-enable value-keyword-case