diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue index b46d933c0..79937c780 100644 --- a/src/common-components/button-question/button-question.vue +++ b/src/common-components/button-question/button-question.vue @@ -160,6 +160,7 @@ export default { .overflow-scroll { // Height will be determined by overall height of content above list height: calc(100% - 300px); + overflow-x: hidden !important; -webkit-overflow-scrolling: touch; } } diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue index 62b7d9147..cea6b403e 100644 --- a/src/common-components/funnel-footer/funnel-footer.vue +++ b/src/common-components/funnel-footer/funnel-footer.vue @@ -126,5 +126,8 @@ export default { justify-content: flex-start; } } + & > .container-fluid { + overflow-x: visible; // needed to fix hidden footer on some iphones + } } diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index 893e7d572..da252308a 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -277,7 +277,8 @@ export default { navigateForward(partsData){ // CSR-98 TEMP - if (store.getters.vehicle.year == 2010) { + const vehicleYearsToShowHeritageFunnel = [ "2001", "2002", "2010" ]; + if (vehicleYearsToShowHeritageFunnel.includes(store.getters.vehicle.year)) { navigateToHeritageFunnel(); return; } diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue index 584242a37..017bb4c6e 100644 --- a/src/layouts/vehicle-damage/windshield-options/windshield-options.vue +++ b/src/layouts/vehicle-damage/windshield-options/windshield-options.vue @@ -99,8 +99,7 @@ export default ({ }, methods: { - initializeComponent( - windshieldAvailableReplacementOptions){ + initializeComponent(windshieldAvailableReplacementOptions){ this.windshieldAvailableReplacementOptions = windshieldAvailableReplacementOptions; this.$refs.replaceOptionsQuestion.initializeComponent(windshieldAvailableReplacementOptions); }, diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss index 8425a3021..2b2fde4c4 100644 --- a/src/styles/common-styles.scss +++ b/src/styles/common-styles.scss @@ -23,7 +23,7 @@ body { } .container, .container-fluid { - overflow-x: hidden !important; + overflow-x: hidden; } .sr-only { diff --git a/src/ux-components/list-card/list-card.spec.js b/src/ux-components/list-card/list-card.spec.js index 11f24abbb..3aa803cc1 100644 --- a/src/ux-components/list-card/list-card.spec.js +++ b/src/ux-components/list-card/list-card.spec.js @@ -145,7 +145,7 @@ describe("list-card.vue", () => { // Assert const label = wrapper.find("label"); - expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-r", "ps-3", "pe-4"]); + expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-2", "ps-4", "pe-4"]); }); it("Should return flex row classes if isWide is true and checkboxTop if buttonLabelSubCopy is true", async () => { @@ -167,7 +167,7 @@ describe("list-card.vue", () => { // Assert const label = wrapper.find("label"); - expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-r", "ps-3", "pe-4", "checkboxTop"]); + expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-2", "ps-4", "pe-4", "checkboxTop"]); }); it("Should return flex column classes if isWide is false", async () => { diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue index d984ac171..eb0570c58 100644 --- a/src/ux-components/list-card/list-card.vue +++ b/src/ux-components/list-card/list-card.vue @@ -107,7 +107,7 @@ export default { computed: { getLabelClasses() { if (this.isWide) { - let classes = "flex-row py-r ps-3 pe-4"; + let classes = "flex-row py-2 ps-4 pe-4"; if (this.buttonLabelSubCopy) { classes += " checkboxTop"; } @@ -173,7 +173,7 @@ export default { // svg's should be constructed on the same canvas size/viewbox to ensure they occupy the same space in the DOM. This will allow easy/proper alignment of elements. See exisitng svg's for examples. height: auto; width: 6.5rem; - margin-bottom: 3rem; + margin-bottom: 2.2rem; max-width: 100%; }