From 6e2970ad8609ff5c516f78e5253681c1d849fcd3 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 21 Mar 2025 12:04:52 -0400 Subject: [PATCH 01/27] CASH-404 desktop updates. --- .../dropdown-question/dropdown-question.vue | 3 +++ src/experiment-components/service-package-radio.vue | 4 ++-- .../funnel-sub-header/funnel-sub-header.vue | 1 + .../save-progress-modal-question.vue | 3 +++ .../save-progress-popup-question.vue | 8 +++++++- src/layouts/quote/quote.vue | 9 ++++++--- src/layouts/schedule/schedule.vue | 3 +++ .../service-location/shop-question/shop-question.vue | 4 ++++ src/styles/common-typography-styles.scss | 2 ++ src/styles/mixins/customMixins.scss | 9 +++++++++ src/styles/ux-variables.scss | 2 +- src/ux-components/list-button/list-button.vue | 2 +- src/ux-components/text-link/text-link.vue | 4 ++++ 13 files changed, 46 insertions(+), 8 deletions(-) diff --git a/src/digital-components/dropdown-question/dropdown-question.vue b/src/digital-components/dropdown-question/dropdown-question.vue index 70bf6c90c..8b3cf023f 100644 --- a/src/digital-components/dropdown-question/dropdown-question.vue +++ b/src/digital-components/dropdown-question/dropdown-question.vue @@ -142,6 +142,9 @@ export default { border: 1px solid $gray-500; border-radius: 0.5rem; min-height: 3rem; + @include media-breakpoint-up(md) { + min-height: 3.5rem; + } &:focus, &:focus-visible { box-shadow: 0 0 0 2.5px $blue; diff --git a/src/experiment-components/service-package-radio.vue b/src/experiment-components/service-package-radio.vue index f0eb991c6..440bcbb58 100644 --- a/src/experiment-components/service-package-radio.vue +++ b/src/experiment-components/service-package-radio.vue @@ -169,10 +169,10 @@ export default { display: flex; flex-direction: column; &:first-child { - margin: 1rem 0.5rem 0 0; + margin: 1rem 1rem 0 0; } &:last-child { - margin: 1rem 0 0 0.5rem; + margin: 1rem 0 0 1rem; } } 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 fa8aea13f..e296206ac 100644 --- a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue +++ b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue @@ -89,6 +89,7 @@ p.small { } .sub-text { margin: 0; + @include responsive-heading-md(0.875rem, 1rem); } .justify-content-start { diff --git a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue index 76ee7c6a2..ef4677371 100644 --- a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue +++ b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue @@ -148,6 +148,9 @@ export default { margin: 0 auto; transition: all 150ms linear; background: none; + @include media-breakpoint-up(md) { + font-size: 1rem; + } &.btn { &.btn-secondary { 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 34ef44e71..ce6b45118 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 @@ -164,6 +164,9 @@ export default { margin: 0 auto 1.5rem auto; transition: all 150ms linear; background: none; + @include media-breakpoint-up(md) { + font-size: 1rem; + } &:hover, &:active, @@ -241,7 +244,10 @@ export default { button.btn.skip-button { padding: 0; order: 2; - font-size: 1rem; + font-size: 0.875rem; + @include media-breakpoint-up(md) { + font-size: 1rem; + } } .modal-disclaimer { font-size: 0.75rem; diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 615662013..49d116946 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -57,7 +57,7 @@ alertClass="alert-info" /> 2) { - return "col-xl-8"; + return "col-xl-10"; } else { return "col-xl-6"; } @@ -775,7 +775,7 @@ export default { }; - diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 2704cdaf6..90bd3d727 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -744,6 +744,9 @@ export default { &:focus { outline: 1px solid $blue; } + @include media-breakpoint-up(md) { + font-size: 1rem; + } } } .funnel-sub-header { diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue index a15d8bb0b..98d7e537e 100644 --- a/src/layouts/service-location/shop-question/shop-question.vue +++ b/src/layouts/service-location/shop-question/shop-question.vue @@ -271,6 +271,10 @@ export default { margin-top: 1rem; text-align: center; + a { + @include responsive-heading-md(0.875rem, 1rem); + } + .button-question { .question-text { margin-top: 0.5rem; diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss index 6a9c4f893..fc3e87896 100644 --- a/src/styles/common-typography-styles.scss +++ b/src/styles/common-typography-styles.scss @@ -8,6 +8,7 @@ body { //Headings //add helper fw-bold to any element to get bold style (500) + h1, .h1 { line-height: 1.325; @@ -36,6 +37,7 @@ h5, .h5 { line-height: 1.325; font-weight: 400; + @include responsive-heading-md(1.25rem, 1.625rem); } h6, diff --git a/src/styles/mixins/customMixins.scss b/src/styles/mixins/customMixins.scss index d0670ad6c..33649319f 100644 --- a/src/styles/mixins/customMixins.scss +++ b/src/styles/mixins/customMixins.scss @@ -8,3 +8,12 @@ @mixin box-shadow-hover($color) { box-shadow: 0 0 0 4px $color; } + +//Define heading sizes for medium breakpoints +@mixin responsive-heading-md($font-size, $md-font-size) { + font-size: $font-size; + + @include media-breakpoint-up(md) { + font-size: $md-font-size; + } +} \ No newline at end of file diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index df984b224..5c4045fd7 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -141,7 +141,7 @@ $h1-font-size: $font-size-base * 3; $h2-font-size: $font-size-base * 2.625; $h3-font-size: $font-size-base * 2; $h4-font-size: $font-size-base * 1.625; -$h5-font-size: $font-size-base * 1.25; +//$h5-font-size: $font-size-base * 1.25;// Font size set in customMixins.scss $h6-font-size: $font-size-base * 0.875; //Border Radius diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue index 1ebc46cc7..d31f20e5d 100644 --- a/src/ux-components/list-button/list-button.vue +++ b/src/ux-components/list-button/list-button.vue @@ -5,7 +5,7 @@ v-model="selectedValue">
+ class="button-content list-button-content d-flex flex-column justify-content-center py-3 px-4 p-md-4"> {{ buttonLabel }} diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue index 30cd2d7e5..7c19d7911 100644 --- a/src/ux-components/text-link/text-link.vue +++ b/src/ux-components/text-link/text-link.vue @@ -80,10 +80,14 @@ a { } &.navigation-link, &.new-window-link { + font-size: .875rem; color: $black; line-height: 26px; white-space: nowrap; align-items: center; + @include media-breakpoint-up(md) { + font-size: 1rem; + } } &.new-window-link { margin-bottom: 1.5rem; From 9b336d3c4feafcacd08ff97e6b4a6d4cca59b8d3 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 24 Mar 2025 09:25:29 -0400 Subject: [PATCH 02/27] Format code. --- src/styles/mixins/customMixins.scss | 2 +- src/ux-components/text-link/text-link.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/mixins/customMixins.scss b/src/styles/mixins/customMixins.scss index 33649319f..e5f0caa86 100644 --- a/src/styles/mixins/customMixins.scss +++ b/src/styles/mixins/customMixins.scss @@ -16,4 +16,4 @@ @include media-breakpoint-up(md) { font-size: $md-font-size; } -} \ No newline at end of file +} diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue index 7c19d7911..9283c08e7 100644 --- a/src/ux-components/text-link/text-link.vue +++ b/src/ux-components/text-link/text-link.vue @@ -80,7 +80,7 @@ a { } &.navigation-link, &.new-window-link { - font-size: .875rem; + font-size: 0.875rem; color: $black; line-height: 26px; white-space: nowrap; From c539fc6a0b86235f1fde923932daa88e8c09b618 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 24 Mar 2025 13:24:59 -0400 Subject: [PATCH 03/27] CASH-404 desktop updates. --- .../textbox-question/textbox-question.vue | 7 +++++-- src/fmg-components/funnel-sub-header/funnel-sub-header.vue | 2 +- src/layouts/quote/quote.vue | 2 +- .../shop-question/shop-list-button/shop-list-button.vue | 2 +- .../service-location/shop-question/shop-question.vue | 2 +- src/styles/common-typography-styles.scss | 2 +- src/styles/mixins/customMixins.scss | 7 +++++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue index 4eb81ab0b..e6d75fee1 100644 --- a/src/digital-components/textbox-question/textbox-question.vue +++ b/src/digital-components/textbox-question/textbox-question.vue @@ -325,8 +325,11 @@ export default { border: 1px solid $gray-500; border-radius: 0.5rem; min-height: 3rem; - max-height: 48px; - padding: 12px 16px; + padding: 0.75rem 1rem; + @include media-breakpoint-up(md) { + padding: 1rem; + min-height: 3.5rem; + } &::placeholder { color: $gray-500; } 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 e296206ac..f42a90972 100644 --- a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue +++ b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue @@ -89,7 +89,7 @@ p.small { } .sub-text { margin: 0; - @include responsive-heading-md(0.875rem, 1rem); + @include responsive-font-size-md(0.875rem, 1rem); } .justify-content-start { diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 49d116946..c062069af 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -794,6 +794,6 @@ export default { display: block; } :deep(.promo-modal-question a) { - @include responsive-heading-md(0.875rem, 1rem); + @include responsive-font-size-md(0.875rem, 1rem); } diff --git a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue index e46b02a96..20accf43b 100644 --- a/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue +++ b/src/layouts/service-location/shop-question/shop-list-button/shop-list-button.vue @@ -6,7 +6,7 @@ v-model="selectedValue">
+ class="button-content list-button-content d-flex flex-column justify-content-center py-3 px-4 p-md-4">
{{ buttonLabel }} diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue index 98d7e537e..4a7818834 100644 --- a/src/layouts/service-location/shop-question/shop-question.vue +++ b/src/layouts/service-location/shop-question/shop-question.vue @@ -272,7 +272,7 @@ export default { text-align: center; a { - @include responsive-heading-md(0.875rem, 1rem); + @include responsive-font-size-md(0.875rem, 1rem); } .button-question { diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss index fc3e87896..a6ab8289f 100644 --- a/src/styles/common-typography-styles.scss +++ b/src/styles/common-typography-styles.scss @@ -37,7 +37,7 @@ h5, .h5 { line-height: 1.325; font-weight: 400; - @include responsive-heading-md(1.25rem, 1.625rem); + @include responsive-font-size-md(1.25rem, 1.625rem); } h6, diff --git a/src/styles/mixins/customMixins.scss b/src/styles/mixins/customMixins.scss index e5f0caa86..9e058e6ee 100644 --- a/src/styles/mixins/customMixins.scss +++ b/src/styles/mixins/customMixins.scss @@ -9,11 +9,14 @@ box-shadow: 0 0 0 4px $color; } -//Define heading sizes for medium breakpoints -@mixin responsive-heading-md($font-size, $md-font-size) { +// Typography size mixin for medium breakpoints +// Use this to adjust font size for medium breakpoint +@mixin responsive-font-size-md($font-size, $md-font-size) { font-size: $font-size; @include media-breakpoint-up(md) { font-size: $md-font-size; } } +// Usage: @include responsive-font-size-md(mobile-font-size-in-rem, desktop-font-size-in-rem); +// Example: @include responsive-font-size-md(0.875rem, 1rem); \ No newline at end of file From 6fbe62a9ac8e33e94828988ec6ecae952a4f6f3d Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 24 Mar 2025 13:34:10 -0400 Subject: [PATCH 04/27] Format code. --- src/styles/mixins/customMixins.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/mixins/customMixins.scss b/src/styles/mixins/customMixins.scss index 9e058e6ee..62abcc82d 100644 --- a/src/styles/mixins/customMixins.scss +++ b/src/styles/mixins/customMixins.scss @@ -19,4 +19,4 @@ } } // Usage: @include responsive-font-size-md(mobile-font-size-in-rem, desktop-font-size-in-rem); -// Example: @include responsive-font-size-md(0.875rem, 1rem); \ No newline at end of file +// Example: @include responsive-font-size-md(0.875rem, 1rem); From 02591b39ce6af67c4b44ab47408e5c6ed13e4589 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Thu, 27 Mar 2025 11:31:22 -0400 Subject: [PATCH 05/27] CASH-403 WIP --- src/App.vue | 4 + .../funnel-footer/funnel-footer.spec.js | 0 .../funnel-footer/funnel-footer.vue | 83 +++++++++++++++++++ .../funnel-header/funnel-header.vue | 5 +- src/styles/common-styles.scss | 6 +- 5 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 src/fmg-components/funnel-footer/funnel-footer.spec.js create mode 100644 src/fmg-components/funnel-footer/funnel-footer.vue diff --git a/src/App.vue b/src/App.vue index b5be4ec86..a0d5cad86 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,6 +5,7 @@ + @@ -12,6 +13,7 @@ import { handleAnyComponentFocus } from "@/helpers/button-question-focus-helper"; import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import { showFmgLoadingModal } from "@/helpers/loading-modal-helper"; +import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer.vue"; export default { name: "app", @@ -32,6 +34,8 @@ export default { }, components: { loadingModal, + funnelFooter, + }, }; diff --git a/src/fmg-components/funnel-footer/funnel-footer.spec.js b/src/fmg-components/funnel-footer/funnel-footer.spec.js new file mode 100644 index 000000000..e69de29bb diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue new file mode 100644 index 000000000..5a1a76bc1 --- /dev/null +++ b/src/fmg-components/funnel-footer/funnel-footer.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/fmg-components/funnel-header/funnel-header.vue b/src/fmg-components/funnel-header/funnel-header.vue index 22d9e77fa..30c326178 100644 --- a/src/fmg-components/funnel-header/funnel-header.vue +++ b/src/fmg-components/funnel-header/funnel-header.vue @@ -3,7 +3,7 @@ class="funnel-header d-flex justify-content-center align-items-center flex-column" v-if="imageSrc"> Safelite logo - +
+ Cookie preferences Date: Mon, 31 Mar 2025 14:08:01 -0400 Subject: [PATCH 11/27] Format code. --- src/fmg-components/funnel-header/menu-modal/menu-modal.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue index 8e5c21708..9b5ebb536 100644 --- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue +++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue @@ -57,7 +57,9 @@ alt="Your privacy choices" /> - Cookie preferences + + Cookie preferences + Date: Mon, 31 Mar 2025 14:50:53 -0400 Subject: [PATCH 12/27] CASH-442 update cookie link. Test. --- .../funnel-header/menu-modal/menu-modal.vue | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue index 9b5ebb536..9c77cec35 100644 --- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue +++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue @@ -56,26 +56,22 @@ src="~@/assets/img/icons/ccpa-icon.svg" alt="Your privacy choices" /> - - - Cookie preferences - - - - -
+ + + + +
@@ -181,6 +177,9 @@ export default { height: 1rem; margin-left: 0.5rem; } + :deep(.navigation-link) { + margin-bottom: 1.5rem; + } } .modal-fullscreen { width: 100vw; From ed00b2fc60e1f503f127752133698943462f8bf3 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 31 Mar 2025 14:52:23 -0400 Subject: [PATCH 13/27] Format code. --- .../funnel-header/menu-modal/menu-modal.vue | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue index 9c77cec35..4dc07f3a5 100644 --- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue +++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue @@ -56,22 +56,22 @@ src="~@/assets/img/icons/ccpa-icon.svg" alt="Your privacy choices" /> - - - - - + + + + + From 7a59299905c4b04037c7c3b89c54ea49ab7608fd Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 1 Apr 2025 10:28:18 -0400 Subject: [PATCH 14/27] CASH-403 WIP footer updates. --- src/fmg-components/funnel-footer/funnel-footer.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue index 677bb1f81..a980a5682 100644 --- a/src/fmg-components/funnel-footer/funnel-footer.vue +++ b/src/fmg-components/funnel-footer/funnel-footer.vue @@ -1,14 +1,14 @@ + Date: Thu, 3 Apr 2025 13:32:12 -0400 Subject: [PATCH 16/27] CASH-403 WIP footer updates. --- src/assets/img/neighborhood.svg | 123 ++++++--------------- src/assets/img/skyline-van.svg | 182 +++++++++++++------------------- 2 files changed, 104 insertions(+), 201 deletions(-) diff --git a/src/assets/img/neighborhood.svg b/src/assets/img/neighborhood.svg index 4022f9116..30eef566e 100644 --- a/src/assets/img/neighborhood.svg +++ b/src/assets/img/neighborhood.svg @@ -1,92 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/skyline-van.svg b/src/assets/img/skyline-van.svg index 443ae3463..c452e70f1 100644 --- a/src/assets/img/skyline-van.svg +++ b/src/assets/img/skyline-van.svg @@ -1,114 +1,76 @@ - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + \ No newline at end of file From f0843d4212ce07fee90f7b6534a32233c6894bcc Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Thu, 3 Apr 2025 13:50:40 -0400 Subject: [PATCH 17/27] CASH-403 WIP remove link underline. --- src/fmg-components/funnel-footer/funnel-footer.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue index 00f843b0e..5617e44ce 100644 --- a/src/fmg-components/funnel-footer/funnel-footer.vue +++ b/src/fmg-components/funnel-footer/funnel-footer.vue @@ -91,6 +91,7 @@ export default { align-items: center; :deep(a) { + text-decoration: none; &.new-window-link { margin: 0 0.75rem; } From ca9aba53e434d0e441705655cbd40a74f02bdd0a Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 4 Apr 2025 08:35:39 -0400 Subject: [PATCH 18/27] CASH-403 footer updates. --- src/fmg-components/funnel-footer/funnel-footer.vue | 2 +- src/styles/common-styles.scss | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue index 5617e44ce..dc3cf9577 100644 --- a/src/fmg-components/funnel-footer/funnel-footer.vue +++ b/src/fmg-components/funnel-footer/funnel-footer.vue @@ -70,7 +70,7 @@ export default { display: flex; flex-direction: column; width: 100%; - background: #ffffff; + background: transparent; align-items: end; margin-top: auto; diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss index eda5b58b5..85065a799 100644 --- a/src/styles/common-styles.scss +++ b/src/styles/common-styles.scss @@ -8,6 +8,14 @@ body { display: flex; flex-direction: column; min-height: 100dvh; + form { + >.container-fluid { + margin-bottom: -1rem; + @media screen and (min-width: 1090px) { + margin-bottom: -5rem; + } + } + } } .container-fluid { padding: 0 1.5rem; From 375d2dd1482add6a6fe12dca02c40d0d17158f1d Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 4 Apr 2025 08:47:51 -0400 Subject: [PATCH 19/27] CASH-403 update navbar position and z-index. --- src/fmg-components/nav-bar/nav-bar.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/fmg-components/nav-bar/nav-bar.vue b/src/fmg-components/nav-bar/nav-bar.vue index f23ecd244..eaf37047c 100644 --- a/src/fmg-components/nav-bar/nav-bar.vue +++ b/src/fmg-components/nav-bar/nav-bar.vue @@ -129,6 +129,8 @@ export default { overflow: visible; display: flex; padding: 0; + position: relative; + z-index: 2; a { display: flex; justify-content: center; From 3be58faead23b45d78e53bca4a2b125cba3ea9d6 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 7 Apr 2025 09:31:36 -0400 Subject: [PATCH 20/27] Format code. Hide menu modal. --- src/App.vue | 3 +- .../funnel-footer/funnel-footer.vue | 73 +++++++++---------- .../funnel-header/funnel-header.vue | 4 +- src/styles/common-styles.scss | 2 +- 4 files changed, 37 insertions(+), 45 deletions(-) diff --git a/src/App.vue b/src/App.vue index a0d5cad86..422ae2893 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,7 @@ - + @@ -35,7 +35,6 @@ export default { components: { loadingModal, funnelFooter, - }, }; diff --git a/src/fmg-components/funnel-footer/funnel-footer.vue b/src/fmg-components/funnel-footer/funnel-footer.vue index dc3cf9577..89db470f0 100644 --- a/src/fmg-components/funnel-footer/funnel-footer.vue +++ b/src/fmg-components/funnel-footer/funnel-footer.vue @@ -3,57 +3,50 @@
- +
- +
-