From b5885940cefaae2baa25f55657928b23d8e463ad Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 11 Jan 2023 16:23:27 -0500
Subject: [PATCH 1/4] Revert "Format code."

This reverts commit ae02b41ae487ff61b814c393b378ffcba13d094c.
---
 src/common-components/funnel-sub-header/funnel-sub-header.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 356e6fb0e..33f518674 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -12,9 +12,7 @@
                     @click-event="clickEvent" />
             </h5>
         </div>
-        <div
-            v-if="subText"
-            class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
+        <div v-if="subText" class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
             <p class="text-center small fw-normal sub-text">
                 <span>
                     {{ subText }}

From 7dfa1dc0ba2f3efc82f8996d79a278dc5fcc6242 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 11 Jan 2023 15:26:19 -0500
Subject: [PATCH 2/4] Revert "Style updates."

This reverts commit e59c03bc1311b8bbc8758fbe914883259159ff78.
---
 .../funnel-sub-header/funnel-sub-header.vue          | 10 ++++------
 src/layouts/estimate/estimate.vue                    |  6 +++---
 src/layouts/quote/quote.vue                          | 12 +-----------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 33f518674..ae97dbb9f 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="funnel-sub-header">
+    <div class="current_car_info-text">
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
             <h5 class="text-center fw-normal mb-0" :class="headerColor">
@@ -12,8 +12,9 @@
                     @click-event="clickEvent" />
             </h5>
         </div>
-        <div v-if="subText" class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
-            <p class="text-center small fw-normal sub-text">
+        <div
+            class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
+            <p class="text-center small fw-normal mb-5">
                 <span>
                     {{ subText }}
                 </span>
@@ -76,7 +77,4 @@ h5 {
 p.small {
     color: $gray-550;
 }
-.sub-text {
-    margin: 0;
-}
 </style>
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 9d7dedd04..dd16a479f 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -1,6 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <div class="page-container-grouped-styles estimate">
+        <div class="page-container-grouped-styles">
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner cmsWidgetName="VehicleBannerWidget" />
@@ -300,12 +300,12 @@ export default {
 </script>
 
 <style lang="scss">
-.estimate .vinLookupMethodHeading p {
+.vinLookupMethodHeading p {
     font-size: 1rem;
     font-weight: 500;
     color: $black;
 }
-.estimate .funnel-sub-header {
+div .current_car_info-text {
     padding-bottom: 16px;
 }
 </style>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 6ce61a7b0..1063cacf5 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -1,6 +1,6 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm" v-slot="{ meta }">
-        <div class="page-container-grouped-styles quote">
+        <div class="page-container-grouped-styles">
             <loadingModal ref="loadingModal" />
             <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
             <vehicleBanner
@@ -206,13 +206,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss">
-.quote {
-    .funnel-sub-header {
-        .sub-text {
-            margin-bottom: 24px;
-        }
-    }
-}
-</style>

From 7f28e504abf66c8abffd2cfc3bee686bfe24cbf8 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Wed, 11 Jan 2023 13:06:12 -0500
Subject: [PATCH 3/4] Revert "Remove textblock. Add subtext copy to CMS."

This reverts commit 7cfdc815379f25e5e7b93aae993a076ac1fbb9ee.
---
 .../funnel-sub-header/funnel-sub-header.vue          | 12 ++++++++----
 src/layouts/quote/quote.vue                          |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index ae97dbb9f..5a475daab 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -14,10 +14,12 @@
         </div>
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
-            <p class="text-center small fw-normal mb-5">
-                <span>
-                    {{ subText }}
-                </span>
+            <p class="text-center small fw-normal mb-0">
+                <textBlock
+                    cmsWidgetName="paymentServiceOptionsCopy"
+                    justifyText="center"
+                    typeStyle="small"
+                    class="mt-2 mb-5" />
             </p>
         </div>
     </div>
@@ -25,6 +27,7 @@
 
 <script>
 import buttonBack from "@/common-components/funnel-sub-header/button-back/button-back";
+import textBlock from "@/common-components/text-block/text-block";
 
 export default {
     name: "FunnelSubHeader",
@@ -34,6 +37,7 @@ export default {
     },
     components: {
         buttonBack,
+        textBlock,
     },
     computed: {
         text() {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 1063cacf5..0a5792475 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -8,6 +8,11 @@
                 :displayGenericVehicleImage="false" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
+                <!-- <textBlock
+                    cmsWidgetName="paymentServiceOptionsCopy"
+                    justifyText="center"
+                    typeStyle="small"
+                    class="mt-2 mb-5" /> -->
                 <cashOrInsuranceQuestion
                     ref="cashOrInsurance"
                     cmsWidgetName="CashOrInsuranceQuestionWidget"

From 03cd254418f4496d79a99ba2f6890e7e5198cae3 Mon Sep 17 00:00:00 2001
From: Bryan Mauger <bryan.mauger@safelite.com>
Date: Tue, 10 Jan 2023 18:39:00 -0500
Subject: [PATCH 4/4] Revert "CSR-1050 move paymentServiceOptionsCopy copy to
 funnel-sub-header"

This reverts commit 3ab512ace7ab45ad7a7ebed1ad2c2530226ea294.
---
 .../funnel-sub-header/funnel-sub-header.vue            | 10 +++-------
 src/common-components/text-block/text-block.vue        |  2 +-
 src/layouts/quote/quote.vue                            |  4 ++--
 src/ux-components/text-link/text-link.vue              |  5 +++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/common-components/funnel-sub-header/funnel-sub-header.vue b/src/common-components/funnel-sub-header/funnel-sub-header.vue
index 5a475daab..ba977c55a 100644
--- a/src/common-components/funnel-sub-header/funnel-sub-header.vue
+++ b/src/common-components/funnel-sub-header/funnel-sub-header.vue
@@ -15,11 +15,9 @@
         <div
             class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
             <p class="text-center small fw-normal mb-0">
-                <textBlock
-                    cmsWidgetName="paymentServiceOptionsCopy"
-                    justifyText="center"
-                    typeStyle="small"
-                    class="mt-2 mb-5" />
+                <span>
+                    {{ subText }}
+                </span>
             </p>
         </div>
     </div>
@@ -27,7 +25,6 @@
 
 <script>
 import buttonBack from "@/common-components/funnel-sub-header/button-back/button-back";
-import textBlock from "@/common-components/text-block/text-block";
 
 export default {
     name: "FunnelSubHeader",
@@ -37,7 +34,6 @@ export default {
     },
     components: {
         buttonBack,
-        textBlock,
     },
     computed: {
         text() {
diff --git a/src/common-components/text-block/text-block.vue b/src/common-components/text-block/text-block.vue
index 33854e143..a12d3f398 100644
--- a/src/common-components/text-block/text-block.vue
+++ b/src/common-components/text-block/text-block.vue
@@ -1,6 +1,6 @@
 <template>
     <div
-        class="text-block w-100 mt-2"
+        class="text-block d-flex w-100 mt-2"
         :class="[justifyText, typeStyle, fontWeight]"
         v-html="this.TextBlockCopy"></div>
 </template>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 0a5792475..dfada2db0 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -8,11 +8,11 @@
                 :displayGenericVehicleImage="false" />
             <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
             <div class="fade-on-route-transition sub-container make-tall">
-                <!-- <textBlock
+                <textBlock
                     cmsWidgetName="paymentServiceOptionsCopy"
                     justifyText="center"
                     typeStyle="small"
-                    class="mt-2 mb-5" /> -->
+                    class="mt-2 mb-5" />
                 <cashOrInsuranceQuestion
                     ref="cashOrInsurance"
                     cmsWidgetName="CashOrInsuranceQuestionWidget"
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index f28669a45..fff40d9a0 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -44,9 +44,10 @@ export default {
 
 <style lang="scss">
 a {
+    display: inline-flex !important;
     color: $blue;
-    text-underline-offset: 5px;
-    line-height: 2;
+    text-underline-offset: 0.5em;
+    line-height: 26px;
     padding: 0 0 4px 0;
     font-weight: 500;
     max-width: fit-content;