From e30503c9480a4adb0e0ead70901bc1e8f74dc503 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 16 Nov 2022 15:53:47 -0500
Subject: [PATCH 1/6] Update privacy links and add slot for icon.

---
 .../funnel-header/menu-modal/menu-modal.vue          | 12 ++++++++++--
 src/ux-components/text-link/text-link.vue            |  4 +++-
 2 files changed, 13 insertions(+), 3 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 bd13e46a8..4f0ecf0a6 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -22,8 +22,9 @@
         </div>
         <div class="modal-body d-flex flex-column">
           <textLink linkType="navigation" text="Terms of use" href="https://www.safelite.com/terms-of-use" target="_blank" />
-          <textLink linkType="navigation" text="Privacy policy" href="https://www.safelite.com/safelite-group-privacy-policy" target="_blank" />
-          <textLink linkType="navigation" text="Do not sell my information" href="https://privacyportal-cdn.onetrust.com/dsarwebform/d3b95a93-e22e-4d4d-a806-482052406557/9e371601-eae3-4338-9430-b90b9036022b.html" target="_blank" />
+          <textLink linkType="navigation" text="Your privacy choices" href="" target="_blank"><span class="ccpa-icon"></span></textLink>
+          <textLink linkType="navigation" text="Warranty" href="" 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
@@ -111,6 +112,13 @@ export default {
   overflow-y: visible;
   .modal-body {
     padding: 2rem;
+    .ccpa-icon {
+      background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xml:space='preserve' style='enable-background:new 0 0 30 14' viewBox='0 0 30 14'%3E%3Cpath d='M7.4 12.8h6.8l3.1-11.6H7.4C4.2 1.2 1.6 3.8 1.6 7s2.6 5.8 5.8 5.8z' style='fill-rule:evenodd;clip-rule:evenodd;fill:%23fff'/%3E%3Cpath d='M22.6 0H7.4c-3.9 0-7 3.1-7 7s3.1 7 7 7h15.2c3.9 0 7-3.1 7-7s-3.2-7-7-7zm-21 7c0-3.2 2.6-5.8 5.8-5.8h9.9l-3.1 11.6H7.4c-3.2 0-5.8-2.6-5.8-5.8z' style='fill-rule:evenodd;clip-rule:evenodd;fill:%2306f'/%3E%3Cpath d='M24.6 4c.2.2.2.6 0 .8L22.5 7l2.2 2.2c.2.2.2.6 0 .8-.2.2-.6.2-.8 0l-2.2-2.2-2.2 2.2c-.2.2-.6.2-.8 0-.2-.2-.2-.6 0-.8L20.8 7l-2.2-2.2c-.2-.2-.2-.6 0-.8.2-.2.6-.2.8 0l2.2 2.2L23.8 4c.2-.2.6-.2.8 0z' style='fill:%23fff'/%3E%3Cpath d='M12.7 4.1c.2.2.3.6.1.8L8.6 9.8c-.1.1-.2.2-.3.2-.2.1-.5.1-.7-.1L5.4 7.7c-.2-.2-.2-.6 0-.8.2-.2.6-.2.8 0L8 8.6l3.8-4.5c.2-.2.6-.2.9 0z' style='fill:%2306f'/%3E%3C/svg%3E");
+      background-repeat: no-repeat;
+      width: 2.0625rem;
+      height: 1rem;
+      margin-left: .5rem;
+    }
   }
     .modal-fullscreen {
       width: 100vw;
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index d338b9d44..93b139b0d 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -1,5 +1,5 @@
 <template>
-  <a v-if="linkType === 'navigation'" @click="handleClick" class="navigation-link" :href="href">{{text}}</a>
+  <a v-if="linkType === 'navigation'" @click="handleClick" class="navigation-link" :href="href">{{text}}<slot/></a>
   <a v-else-if="linkType === 'footer'" @click="handleClick" class="footer-link" :href="href" target="_blank">{{text}}</a>
   <a v-else-if="linkType === 'textSmall'" @click="handleClick" class="small" :href="href">{{text}}</a>
   <a v-else-if="linkType === 'text'" @click="handleClick" :href="href">{{text}}</a>
@@ -32,6 +32,7 @@ a {
   line-height: 26px;
   padding: 0 0 4px 0;
   font-weight: 500;
+  max-width: fit-content;
   &:hover {
     color: $blue-700;
   }
@@ -45,6 +46,7 @@ a {
     color: $black;
     line-height: 26px;
     white-space: nowrap;
+    align-items: center;
   }
   &.footer-link {
     color: $gray-600;

From d3e6325db0be7273dd4336a745ed946681b44388 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 16 Nov 2022 16:43:05 -0500
Subject: [PATCH 2/6] Add aria information

---
 src/common-components/funnel-header/menu-modal/menu-modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4f0ecf0a6..9cb74bad0 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -22,7 +22,7 @@
         </div>
         <div class="modal-body d-flex flex-column">
           <textLink linkType="navigation" text="Terms of use" href="https://www.safelite.com/terms-of-use" target="_blank" />
-          <textLink linkType="navigation" text="Your privacy choices" href="" target="_blank"><span class="ccpa-icon"></span></textLink>
+          <textLink linkType="navigation" text="Your privacy choices" href="" target="_blank"><span class="ccpa-icon" aria-label="Your privacy choices"></span></textLink>
           <textLink linkType="navigation" text="Warranty" href="" 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>

From 6f6d122e10910c05f2a449fd253b29a3c094df8f Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Fri, 18 Nov 2022 09:58:45 -0500
Subject: [PATCH 3/6] Update slot to use image. Name slot.

---
 src/assets/img/icons/ccpa-icon.svg                        | 6 ++++++
 .../funnel-header/menu-modal/menu-modal.vue               | 8 +++++---
 src/ux-components/text-link/text-link.vue                 | 2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/img/icons/ccpa-icon.svg

diff --git a/src/assets/img/icons/ccpa-icon.svg b/src/assets/img/icons/ccpa-icon.svg
new file mode 100644
index 000000000..30eb3e086
--- /dev/null
+++ b/src/assets/img/icons/ccpa-icon.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 30 14" viewBox="0 0 30 14">
+  <path d="M7.4 12.8h6.8l3.1-11.6H7.4C4.2 1.2 1.6 3.8 1.6 7s2.6 5.8 5.8 5.8z" style="fill-rule:evenodd;clip-rule:evenodd;fill:#fff"/>
+  <path d="M22.6 0H7.4c-3.9 0-7 3.1-7 7s3.1 7 7 7h15.2c3.9 0 7-3.1 7-7s-3.2-7-7-7zm-21 7c0-3.2 2.6-5.8 5.8-5.8h9.9l-3.1 11.6H7.4c-3.2 0-5.8-2.6-5.8-5.8z" style="fill-rule:evenodd;clip-rule:evenodd;fill:#06f"/>
+  <path d="M24.6 4c.2.2.2.6 0 .8L22.5 7l2.2 2.2c.2.2.2.6 0 .8-.2.2-.6.2-.8 0l-2.2-2.2-2.2 2.2c-.2.2-.6.2-.8 0-.2-.2-.2-.6 0-.8L20.8 7l-2.2-2.2c-.2-.2-.2-.6 0-.8.2-.2.6-.2.8 0l2.2 2.2L23.8 4c.2-.2.6-.2.8 0z" style="fill:#fff"/>
+  <path d="M12.7 4.1c.2.2.3.6.1.8L8.6 9.8c-.1.1-.2.2-.3.2-.2.1-.5.1-.7-.1L5.4 7.7c-.2-.2-.2-.6 0-.8.2-.2.6-.2.8 0L8 8.6l3.8-4.5c.2-.2.6-.2.9 0z" style="fill:#06f"/>
+</svg>
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 9cb74bad0..a5ab85952 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -22,7 +22,11 @@
         </div>
         <div class="modal-body d-flex flex-column">
           <textLink linkType="navigation" text="Terms of use" href="https://www.safelite.com/terms-of-use" target="_blank" />
-          <textLink linkType="navigation" text="Your privacy choices" href="" target="_blank"><span class="ccpa-icon" aria-label="Your privacy choices"></span></textLink>
+          <textLink linkType="navigation" text="Your privacy choices" href="https://www.safelite.com/privacy-center" target="_blank">
+            <template v-slot:ccpa>
+              <img class="ccpa-icon" src="~@/assets/img/icons/ccpa-icon.svg" alt="Your privacy choices"/>
+            </template>
+            </textLink>
           <textLink linkType="navigation" text="Warranty" href="" 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>
@@ -113,8 +117,6 @@ export default {
   .modal-body {
     padding: 2rem;
     .ccpa-icon {
-      background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xml:space='preserve' style='enable-background:new 0 0 30 14' viewBox='0 0 30 14'%3E%3Cpath d='M7.4 12.8h6.8l3.1-11.6H7.4C4.2 1.2 1.6 3.8 1.6 7s2.6 5.8 5.8 5.8z' style='fill-rule:evenodd;clip-rule:evenodd;fill:%23fff'/%3E%3Cpath d='M22.6 0H7.4c-3.9 0-7 3.1-7 7s3.1 7 7 7h15.2c3.9 0 7-3.1 7-7s-3.2-7-7-7zm-21 7c0-3.2 2.6-5.8 5.8-5.8h9.9l-3.1 11.6H7.4c-3.2 0-5.8-2.6-5.8-5.8z' style='fill-rule:evenodd;clip-rule:evenodd;fill:%2306f'/%3E%3Cpath d='M24.6 4c.2.2.2.6 0 .8L22.5 7l2.2 2.2c.2.2.2.6 0 .8-.2.2-.6.2-.8 0l-2.2-2.2-2.2 2.2c-.2.2-.6.2-.8 0-.2-.2-.2-.6 0-.8L20.8 7l-2.2-2.2c-.2-.2-.2-.6 0-.8.2-.2.6-.2.8 0l2.2 2.2L23.8 4c.2-.2.6-.2.8 0z' style='fill:%23fff'/%3E%3Cpath d='M12.7 4.1c.2.2.3.6.1.8L8.6 9.8c-.1.1-.2.2-.3.2-.2.1-.5.1-.7-.1L5.4 7.7c-.2-.2-.2-.6 0-.8.2-.2.6-.2.8 0L8 8.6l3.8-4.5c.2-.2.6-.2.9 0z' style='fill:%2306f'/%3E%3C/svg%3E");
-      background-repeat: no-repeat;
       width: 2.0625rem;
       height: 1rem;
       margin-left: .5rem;
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index 93b139b0d..d2d791050 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -1,5 +1,5 @@
 <template>
-  <a v-if="linkType === 'navigation'" @click="handleClick" class="navigation-link" :href="href">{{text}}<slot/></a>
+  <a v-if="linkType === 'navigation'" @click="handleClick" class="navigation-link" :href="href">{{text}}<slot name="ccpa"></slot></a>
   <a v-else-if="linkType === 'footer'" @click="handleClick" class="footer-link" :href="href" target="_blank">{{text}}</a>
   <a v-else-if="linkType === 'textSmall'" @click="handleClick" class="small" :href="href">{{text}}</a>
   <a v-else-if="linkType === 'text'" @click="handleClick" :href="href">{{text}}</a>

From 7e4e0f715dbb00e5858b3c5d4fb38877e5abacb2 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 21 Nov 2022 07:43:27 -0500
Subject: [PATCH 4/6] Update links.

---
 .../funnel-header/menu-modal/menu-modal.vue               | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 a5ab85952..a85419899 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -21,14 +21,14 @@
           <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="https://www.safelite.com/terms-of-use" target="_blank" />
-          <textLink linkType="navigation" text="Your privacy choices" href="https://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:ccpa>
               <img class="ccpa-icon" src="~@/assets/img/icons/ccpa-icon.svg" alt="Your privacy choices"/>
             </template>
             </textLink>
-          <textLink linkType="navigation" text="Warranty" href="" 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 linkType="navigation" text="Warranty" href="//www.safelite.com/national-lifetime-warranty" target="_blank" />
+          <textLink linkType="navigation" text="Notice at collection" href="//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

From 2e3edc208267bed04d550d1271570ee66d077b23 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Mon, 21 Nov 2022 09:47:20 -0500
Subject: [PATCH 5/6] Update slot name to less-specific and insert in other
 links.

---
 .../funnel-header/menu-modal/menu-modal.vue               | 4 ++--
 src/ux-components/text-link/text-link.vue                 | 8 ++++----
 2 files changed, 6 insertions(+), 6 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 a85419899..8af237bf7 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -23,10 +23,10 @@
         <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:ccpa>
+            <template v-slot:after-text>
               <img class="ccpa-icon" src="~@/assets/img/icons/ccpa-icon.svg" alt="Your privacy choices"/>
             </template>
-            </textLink>
+          </textLink>
           <textLink linkType="navigation" text="Warranty" href="//www.safelite.com/national-lifetime-warranty" target="_blank" />
           <textLink linkType="navigation" text="Notice at collection" href="//privacyportal-cdn.onetrust.com/dsarwebform/d3b95a93-e22e-4d4d-a806-482052406557/9e371601-eae3-4338-9430-b90b9036022b.html" target="_blank" />
         </div>
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index d2d791050..2b7d0c3c0 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -1,8 +1,8 @@
 <template>
-  <a v-if="linkType === 'navigation'" @click="handleClick" class="navigation-link" :href="href">{{text}}<slot name="ccpa"></slot></a>
-  <a v-else-if="linkType === 'footer'" @click="handleClick" class="footer-link" :href="href" target="_blank">{{text}}</a>
-  <a v-else-if="linkType === 'textSmall'" @click="handleClick" class="small" :href="href">{{text}}</a>
-  <a v-else-if="linkType === 'text'" @click="handleClick" :href="href">{{text}}</a>
+  <a v-if="linkType === 'navigation'" @click="handleClick" class="navigation-link" :href="href">{{text}}<slot name="after-text"></slot></a>
+  <a v-else-if="linkType === 'footer'" @click="handleClick" class="footer-link" :href="href" target="_blank">{{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>
+  <a v-else-if="linkType === 'text'" @click="handleClick" :href="href">{{text}}<slot name="after-text"></slot></a>
 </template>
 
 <script>

From 54264882d49f26c19eb053da9e4efc2456c7269f Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 22 Nov 2022 08:47:07 -0500
Subject: [PATCH 6/6] Update link.

---
 src/common-components/funnel-header/menu-modal/menu-modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8af237bf7..18018e2fe 100644
--- a/src/common-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/common-components/funnel-header/menu-modal/menu-modal.vue
@@ -28,7 +28,7 @@
             </template>
           </textLink>
           <textLink linkType="navigation" text="Warranty" href="//www.safelite.com/national-lifetime-warranty" target="_blank" />
-          <textLink linkType="navigation" text="Notice at collection" href="//privacyportal-cdn.onetrust.com/dsarwebform/d3b95a93-e22e-4d4d-a806-482052406557/9e371601-eae3-4338-9430-b90b9036022b.html" 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