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

Merge branch 'release/2026.01.08' into feature/CASH-1790-refactor-1

Browse source
This commit is contained in:
Adam Caouette 2025-12-11 12:56:25 -05:00
commit 09f0da4000
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/layouts/mobile-details/mobile-details.vue
View file

@ -25,6 +25,11 @@
cmsWidgetName="PleaseProvideAddressWidget" cmsWidgetName="PleaseProvideAddressWidget"
class="provide-address-header" /> class="provide-address-header" />
<textBlock <textBlock
v-if="isMSRFeeApplicable()"
cmsWidgetName="VehicleKeysMSRMessageWidget"
class="keys-message" />
<textBlock
v-else
cmsWidgetName="VehicleKeysMessageWidget" cmsWidgetName="VehicleKeysMessageWidget"
class="keys-message" /> class="keys-message" />
<mobileAddressQuestions <mobileAddressQuestions
@ -143,6 +148,9 @@ export default {
getIsVehicleProtectedFromStore() { getIsVehicleProtectedFromStore() {
return store.getters.order.serviceLocation.isVehicleProtected; return store.getters.order.serviceLocation.isVehicleProtected;
}, },
isMSRFeeApplicable() {
return store.getters.order.isMSRFeeApplicable;
},
async forwardButtonAction() { async forwardButtonAction() {
await this.dispatchStoreAction( await this.dispatchStoreAction(
this.storeActions.SAVE_MOBILE_DETAILS, this.storeActions.SAVE_MOBILE_DETAILS,

3
src/layouts/quote/afterpay-modal-banner/afterpay-modal-banner.vue
View file

@ -253,9 +253,10 @@ export default {
height: 40px; height: 40px;
} }
h3 { h3 {
font-family: UrbanistSemibold; font-family: UrbanistBold;
font-size: 1rem; font-size: 1rem;
margin: 0 0 0 0.5rem; margin: 0 0 0 0.5rem;
color: $black;
} }
} }
p { p {

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

@ -123,8 +123,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: $font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; 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;

5
src/ux-components/text-link/text-link.vue
View file

@ -15,7 +15,7 @@
<!-- prettier-ignore --> <!-- prettier-ignore -->
<a v-else-if="linkType === 'textSmall'" @click="handleClick" class="small" :href="href">{{ text }}<slot name="after-text"></slot></a> <a v-else-if="linkType === 'textSmall'" @click="handleClick" class="small" :href="href">{{ text }}<slot name="after-text"></slot></a>
<!-- prettier-ignore --> <!-- prettier-ignore -->
<a v-else-if="linkType === 'text'" @click="handleClick" :href="href">{{ text }}<slot name="after-text"></slot></a> <a v-else-if="linkType === 'text'" @click="handleClick" class="text-link" :href="href">{{ text }}<slot name="after-text"></slot></a>
</template> </template>
<script> <script>
@ -89,5 +89,8 @@ a {
&.new-window-link { &.new-window-link {
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
} }
&.text-link {
white-space: nowrap;
}
} }
</style> </style>