Merge branch 'release/2025.04.24' into feature/CASH-501

This commit is contained in:
Johnny Shultz 2025-04-15 17:04:37 -04:00 committed by GitHub
commit 6fc4455c7c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 34 additions and 10 deletions

View file

@ -55,8 +55,8 @@
<buttonMain <buttonMain
ref="buttonMain" ref="buttonMain"
:buttonText="DonationAddButtonCopy" :buttonText="DonationAddButtonCopy"
loaderColor="white" loaderColor="blue"
class="w-100 mb-2" class="w-100 mb-2 custom-secondary"
@click-event="handleDonationAction" /> @click-event="handleDonationAction" />
</div> </div>
</div> </div>
@ -291,5 +291,12 @@ export default {
left: -0.25rem; left: -0.25rem;
} }
} }
.custom-secondary {
&:hover {
color: $blue;
background: transparent;
border: 1px solid $blue;
}
}
} }
</style> </style>

View file

@ -78,7 +78,7 @@
<span>in 4 interest-free payments</span> <span>in 4 interest-free payments</span>
<div> <div>
or or
<span v-html="this.buttonAuxillaryCopy"></span> <span v-html="truncatedSinglePayment()"></span>
<span <span
class="strikethrough-price" class="strikethrough-price"
v-if="shouldDisplayStrikeThroughPrice" v-if="shouldDisplayStrikeThroughPrice"
@ -141,6 +141,9 @@ export default {
const decimalPrice = parseFloat(this.buttonAuxillaryCopy.replace("$", "")); const decimalPrice = parseFloat(this.buttonAuxillaryCopy.replace("$", ""));
return "$" + (decimalPrice / 4).toFixed(2); return "$" + (decimalPrice / 4).toFixed(2);
}, },
truncatedSinglePayment() {
return "$" + Math.trunc(this.buttonAuxillaryCopy.replace("$", ""));
},
}, },
}; };
</script> </script>

View file

@ -11,6 +11,7 @@
</div> </div>
</div> </div>
<div class="footer-inner-wrapper"> <div class="footer-inner-wrapper">
<p class="mx-3 my-0 pb-1">&copy; 2025 Safelite Group</p>
<textLink <textLink
linkType="newWindowLink" linkType="newWindowLink"
text="Terms of service" text="Terms of service"
@ -32,11 +33,6 @@
linkType="navigation" linkType="navigation"
text="Cookie preferences" text="Cookie preferences"
href="javascript:OneTrust.ToggleInfoDisplay();" /> href="javascript:OneTrust.ToggleInfoDisplay();" />
<textLink
linkType="newWindowLink"
text="Warranty"
href="//www.safelite.com/national-lifetime-warranty"
target="_blank" />
<textLink <textLink
linkType="newWindowLink" linkType="newWindowLink"
text="Notice at collection" text="Notice at collection"
@ -83,6 +79,14 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
p {
font-size: 0.875rem;
color: $black;
@include media-breakpoint-up(md) {
font-size: 1rem;
}
}
:deep(a) { :deep(a) {
text-decoration: none; text-decoration: none;
&.new-window-link { &.new-window-link {

View file

@ -72,6 +72,7 @@ export class Logger {
applicationConfig.CONSUMER_CF_DISTRO + applicationConfig.FRONTEND_LOGGER_PATH; applicationConfig.CONSUMER_CF_DISTRO + applicationConfig.FRONTEND_LOGGER_PATH;
const headers = { const headers = {
[headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings), [headerKeys.EXPERIMENT]: JSON.stringify(store.getters.experimentSettings),
[headerKeys.APPLICATION_NAME]: applicationConfig.APPLICATION_NAME,
}; };
axios({ axios({

View file

@ -56,7 +56,10 @@
@back-clicked="backButtonAction" @back-clicked="backButtonAction"
@ForwardClicked="forwardButtonAction" /> @ForwardClicked="forwardButtonAction" />
<textBlock cmsWidgetName="DisclaimerCopyWidget" typeStyle="caption" /> <textBlock
class="mb-5"
cmsWidgetName="DisclaimerCopyWidget"
typeStyle="caption" />
</div> </div>
</div> </div>
</div> </div>

View file

@ -203,3 +203,9 @@ export default {
}, },
}; };
</script> </script>
<style lang="scss">
.ui-autocomplete {
z-index: 3;
}
</style>

View file

@ -136,7 +136,7 @@ export default {
color: $white; color: $white;
background: linear-gradient(84.45deg, #125b7e 0%, #3b8fb8 100%); background: linear-gradient(84.45deg, #125b7e 0%, #3b8fb8 100%);
border-radius: 0.5rem; border-radius: 0.5rem;
z-index: 5; z-index: 2;
} }
&:checked:focus + .list-button-horizontal-content { &:checked:focus + .list-button-horizontal-content {