From 8e9f960823428714414650a481ae55fcba305af1 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Mon, 28 Nov 2022 11:53:30 -0500
Subject: [PATCH 1/2] changes to correct a broken merge

due to modal.vue not existing in October or December branches
---
 .../funnel-header/menu-modal/menu-modal.vue   | 52 +++++++++----------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/common-components/funnel-header/menu-modal/menu-modal.vue b/src/common-components/funnel-header/menu-modal/menu-modal.vue
index 30e7fa6b3..1fd38e745 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -35,34 +35,25 @@
                 <div class="bar3"></div>
             </button>
         </div>
-        <div class="modal-body d-flex flex-column">
-            <textLink
-                linkType="navigation"
-                text="Terms of use"
-                href="//www.safelite.com/terms-of-use"
-                target="_blank" />
-            <textLink
-                linkType="navigation"
-                text="Your privacy choices"
-                href="//www.safelite.com/privacy-center"
-                target="_blank">
-                <template v-slot:after-text>
-                    <img
-                        class="ccpa-icon"
-                        src="~@/assets/img/icons/ccpa-icon.svg"
-                        alt="Your privacy choices" />
-                </template>
-            </textLink>
-            <textLink
-                linkType="navigation"
-                text="Warranty"
-                href="//www.safelite.com/national-lifetime-warranty"
-                target="_blank" />
-            <textLink
-                linkType="navigation"
-                text="Notice at collection"
-                href="https://privacyportal-cdn.onetrust.com/dsarwebform/d3b95a93-e22e-4d4d-a806-482052406557/9e371601-eae3-4338-9430-b90b9036022b.html"
-                target="_blank" />
+        <div class="modal-dialog modal-fullscreen">
+            <div class="modal-content">
+                <div class="modal-header visually-hidden">
+                    <h5 class="modal-title" id="footerModalLabel">Footer Navigation</h5>
+                </div>
+                <div class="modal-body d-flex flex-column">
+                    <textLink linkType="navigation" text="Terms of use" href="//www.safelite.com/terms-of-use" target="_blank" />
+                    <textLink linkType="navigation" text="Your privacy choices" href="//www.safelite.com/privacy-center" target="_blank">
+                        <template v-slot:after-text>
+                        <img class="ccpa-icon" src="~@/assets/img/icons/ccpa-icon.svg" alt="Your privacy choices"/>
+                        </template>
+                        </textLink>
+                        <textLink linkType="navigation" text="Warranty" href="//www.safelite.com/national-lifetime-warranty" target="_blank" />
+                        <textLink linkType="navigation" text="Notice at collection" href="https://privacyportal-cdn.onetrust.com/dsarwebform/d3b95a93-e22e-4d4d-a806-482052406557/9e371601-eae3-4338-9430-b90b9036022b.html" target="_blank" />
+                </div>
+                <div class="modal-footer d-flex justify-content-start">
+                    &copy; {{ new Date().getFullYear() }} Safelite Group
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -149,6 +140,11 @@ export default {
         overflow-y: visible;
         .modal-body {
             padding: 2rem;
+            .ccpa-icon {
+                width: 2.0625rem;
+                height: 1rem;
+                margin-left: .5rem;
+            }
         }
         .modal-fullscreen {
             width: 100vw;

From 88044d8534992b003c413ae5378b4210d75e3efc Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Mon, 28 Nov 2022 11:55:59 -0500
Subject: [PATCH 2/2] prettier

---
 .../funnel-header/menu-modal/menu-modal.vue   | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/common-components/funnel-header/menu-modal/menu-modal.vue b/src/common-components/funnel-header/menu-modal/menu-modal.vue
index 1fd38e745..fd0c96cb8 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -41,14 +41,33 @@
                     <h5 class="modal-title" id="footerModalLabel">Footer Navigation</h5>
                 </div>
                 <div class="modal-body d-flex flex-column">
-                    <textLink linkType="navigation" text="Terms of use" href="//www.safelite.com/terms-of-use" target="_blank" />
-                    <textLink linkType="navigation" text="Your privacy choices" href="//www.safelite.com/privacy-center" target="_blank">
+                    <textLink
+                        linkType="navigation"
+                        text="Terms of use"
+                        href="//www.safelite.com/terms-of-use"
+                        target="_blank" />
+                    <textLink
+                        linkType="navigation"
+                        text="Your privacy choices"
+                        href="//www.safelite.com/privacy-center"
+                        target="_blank">
                         <template v-slot:after-text>
-                        <img class="ccpa-icon" src="~@/assets/img/icons/ccpa-icon.svg" alt="Your privacy choices"/>
+                            <img
+                                class="ccpa-icon"
+                                src="~@/assets/img/icons/ccpa-icon.svg"
+                                alt="Your privacy choices" />
                         </template>
-                        </textLink>
-                        <textLink linkType="navigation" text="Warranty" href="//www.safelite.com/national-lifetime-warranty" target="_blank" />
-                        <textLink linkType="navigation" text="Notice at collection" href="https://privacyportal-cdn.onetrust.com/dsarwebform/d3b95a93-e22e-4d4d-a806-482052406557/9e371601-eae3-4338-9430-b90b9036022b.html" target="_blank" />
+                    </textLink>
+                    <textLink
+                        linkType="navigation"
+                        text="Warranty"
+                        href="//www.safelite.com/national-lifetime-warranty"
+                        target="_blank" />
+                    <textLink
+                        linkType="navigation"
+                        text="Notice at collection"
+                        href="https://privacyportal-cdn.onetrust.com/dsarwebform/d3b95a93-e22e-4d4d-a806-482052406557/9e371601-eae3-4338-9430-b90b9036022b.html"
+                        target="_blank" />
                 </div>
                 <div class="modal-footer d-flex justify-content-start">
                     &copy; {{ new Date().getFullYear() }} Safelite Group
@@ -143,7 +162,7 @@ export default {
             .ccpa-icon {
                 width: 2.0625rem;
                 height: 1rem;
-                margin-left: .5rem;
+                margin-left: 0.5rem;
             }
         }
         .modal-fullscreen {