diff --git a/src/constants/progress-bar-mapper.js b/src/constants/progress-bar-mapper.js
index 873549bdf..7c2aa4891 100644
--- a/src/constants/progress-bar-mapper.js
+++ b/src/constants/progress-bar-mapper.js
@@ -1,11 +1,11 @@
export const pageProgressMapper = {
//Combine progress bar slide percent and button steps
vehicle: {
- percent: 10,
+ percent: 8,
step: 1,
},
"vehicle-damage": {
- percent: 14,
+ percent: 11,
step: 1,
},
estimate: {
@@ -49,7 +49,7 @@ export const pageProgressMapper = {
step: 1,
},
quote: {
- percent: 39, //The first Step 2 must be 39 so the animated bar lines up with the dot
+ percent: 62,
step: 2,
},
"insurance-company": {
@@ -61,7 +61,7 @@ export const pageProgressMapper = {
step: 2,
},
schedule: {
- percent: 70.5, //The first Step 3 must be 70.5 so the animated bar lines up with the dot
+ percent: 76,
step: 3,
},
"mobile-details": {
@@ -73,7 +73,7 @@ export const pageProgressMapper = {
step: 3,
},
"payment-method": {
- percent: 97, //The first Step 4 must be 97 so the animated bar lines up with the dot
+ percent: 97,
step: 4,
},
payment: {
diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue
index a61700599..1a3080286 100644
--- a/src/digital-components/date-picker/date-picker.vue
+++ b/src/digital-components/date-picker/date-picker.vue
@@ -1039,6 +1039,7 @@ export default {
fieldset {
flex-grow: 1;
position: relative;
+ width: 100%;
.view-more-dates {
color: $blue;
@@ -1109,11 +1110,11 @@ export default {
.month-year {
grid-area: 1 / 1 / 2 / 5;
- font-family: UrbanistSemiBold;
+ font-family: UrbanistRegular;
color: $black;
justify-content: left;
margin-bottom: 0.5rem;
- font-weight: 500;
+ font-weight: 600;
}
.legend {
grid-area: 1 / 5 / 2 / 8;
diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue
index 1950bcdb8..f0d546782 100644
--- a/src/digital-components/modal/modal.vue
+++ b/src/digital-components/modal/modal.vue
@@ -9,8 +9,7 @@
tabindex="-1"
aria-labelledby="ModalComponentLabel"
@keypress.enter="onEnter"
- aria-hidden="true"
- @click.self="closeModal">
+ aria-hidden="true">
diff --git a/src/experiment-components/service-package-radio-for-afterpay.vue b/src/experiment-components/service-package-radio-for-afterpay.vue
index 1363b9afa..7a3a42278 100644
--- a/src/experiment-components/service-package-radio-for-afterpay.vue
+++ b/src/experiment-components/service-package-radio-for-afterpay.vue
@@ -219,11 +219,6 @@ export default {
&.has-subheader {
& > .package-specs {
display: inline-flex;
- @include media-breakpoint-up(md) {
- & > div:first-of-type {
- display: flex;
- }
- }
}
}
@@ -331,7 +326,6 @@ export default {
}
p {
- font-weight: 600;
display: flex;
justify-content: space-between;
align-items: center;
@@ -339,16 +333,11 @@ export default {
&.sub-label {
color: $green;
-
+ display: inline-flex;
padding: 0.25rem 0;
text-transform: uppercase;
font-size: 0.75rem;
margin-left: auto;
- @include media-breakpoint-up(md) {
- background-color: $green-100;
- padding: 0.25rem 0.5rem;
- border-radius: 0.75rem;
- }
}
}
span {
@@ -375,6 +364,8 @@ export default {
}
div.discount-price {
color: $green;
+ font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+ font-weight: 600;
}
@include media-breakpoint-up(md) {
position: absolute;
@@ -458,6 +449,8 @@ export default {
font-weight: 600;
line-height: 20px;
font-size: 1.25rem;
+ font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
+ font-weight: 600;
span.strikethrough-price {
text-decoration: line-through;
diff --git a/src/experiment-components/service-package-radio.vue b/src/experiment-components/service-package-radio.vue
index bee29afd8..ee7e12712 100644
--- a/src/experiment-components/service-package-radio.vue
+++ b/src/experiment-components/service-package-radio.vue
@@ -291,6 +291,12 @@ export default {
height: 10px;
min-width: 10px;
}
+
+ &.has-subheader {
+ & > .package-specs {
+ display: inline-flex;
+ }
+ }
}
&:hover {
diff --git a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
index b4bfb7276..f62e1c558 100644
--- a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue
@@ -11,9 +11,11 @@
@click-event="clickEvent" />
-
diff --git a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
index ce6b45118..d85afb56e 100644
--- a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
+++ b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
@@ -4,7 +4,6 @@
:ref="modalName"
:headerText="modalHeaderText"
suppressPageScroll
- :staticBackdrop="true"
:onModalClosedCallback="onModalClosed"
:footerButtonText="modalButtonText"
@footer-button-event="saveProgress">
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 065f09449..ff58adf83 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -1,16 +1,24 @@