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

Merge pull request #2596 from Safelite/feature/CASH-341v2

Browse source 
CASH-341
This commit is contained in:
Johnny Shultz 2025-06-20 10:13:57 -04:00 committed by GitHub
commit eecb29cf43
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/fmg-components/cart/cart.vue
View file

@ -1312,7 +1312,7 @@ export default {
.amount-paid, .amount-paid,
.donation-amount { .donation-amount {
font-family: font-family:
UrbanistSemibold, AvertaSemibold; //Okay to remove AvertaSemibold after 2025.06.19 merge/release UrbanistSemibold, AvertaSemibold; /* Okay to remove AvertaSemibold after 2025.06.19 merge/release */
color: $black; color: $black;
} }
.sub-total { .sub-total {

10
src/layouts/schedule/schedule.vue
View file

@ -543,8 +543,14 @@ export default {
this.updateSupportingItems(); this.updateSupportingItems();
if (this.displayWaitList) { if (this.displayWaitList) {
var gaLabel = ""; let gaLabel = "";
const status = this.waitListRequested ? "checked" : "unchecked"; let status = this.waitListRequested ? "checked" : "unchecked";
if (
this.waitListRequested === null &&
this.$store.state.order.customer.waitListRequested === true
) {
status = "checked";
}
const type = store.getters.isMobileAppointment ? "mobile" : "inshop"; const type = store.getters.isMobileAppointment ? "mobile" : "inshop";
gaLabel = `${status}_${type}`; gaLabel = `${status}_${type}`;

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

@ -133,4 +133,4 @@ caption,
url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff"); url("@/assets/fonts/Urbanist-BoldItalic.woff2") format("woff");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

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

@ -121,8 +121,8 @@ $body-color: $gray-600;
//Fonts //Fonts
$font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif; $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", $font-family-monospace:
monospace; UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
// stylelint-enable value-keyword-case // stylelint-enable value-keyword-case
$font-family-base: $font-family-sans-serif; $font-family-base: $font-family-sans-serif;
$font-family-code: $font-family-monospace; $font-family-code: $font-family-monospace;