From a65881a3de824a79ecbce4ef5a6d1ab9949a5542 Mon Sep 17 00:00:00 2001
From: Adam Caouette <adam.caouette@safelite.com>
Date: Mon, 12 Sep 2022 14:27:05 -0400
Subject: [PATCH 1/6] CSR-818: add focus style for greyed out button

---
 src/styles/common-error-styles.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index 25a651d52..a3c4a6ef8 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -138,11 +138,13 @@ html {
       pointer-events: all;
       font-weight: $font-weight-normal;
     }
-    &.btn.btn-primary:hover,
-    &.btn.btn-primary:focus,
-    &.btn.btn-primary:focus-visible {
+    &.btn.btn-primary:hover {
       background: $gray-200;
       box-shadow: none;
     }
+    &.btn.btn-primary:focus,
+    &.btn.btn-primary:focus-visible {
+      box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $blue-700;
+    }
   }
 }

From 9c275b6cb7c81e5df1f4ecb3edb1ae8c2809f036 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Mon, 12 Sep 2022 14:56:42 -0400
Subject: [PATCH 2/6] Before adding text-block to Estimate page

---
 src/layouts/address-lookup/address-lookup.vue      |  2 +-
 .../customer-questions/customer-questions.vue      | 14 ++++++++++++--
 .../license-plate-lookup/license-plate-lookup.vue  | 12 +++++++++++-
 src/layouts/vin-lookup/vin-lookup.vue              | 10 ++++++++++
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index ed1ffd3db..a68012e17 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -6,7 +6,7 @@
         <vehicleBanner cmsWidgetName="VehicleBannerWidget" ref="vehicleBanner" :displayGenericVehicleImage=false />
         <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" ref="funnelSubHeader" />
         <div class="fade-on-route-transition sub-container make-tall">
-            <customerQuestions ref="customerQuestions" v-model="customerQuestions" />
+            <customerQuestions ref="customerQuestions" v-model="customerQuestions" />           
             <alert ref="alertVinNotFound" 
 				v-if="displayVinNotFoundAlert" 
 				class="mb-4" 
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index cb6d029bc..defcbe5e2 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -24,7 +24,7 @@
 			/>
 		</div>
 	</div>
-	<div class="row mb-5">
+	<div class="row mb-4">
 		<div class="col">
 			<textboxQuestion
 				cmsWidgetName="EmailAddressQuestionWidget"
@@ -35,7 +35,15 @@
 				validationRules="email-address-required|email-address-format"
 			/>
 		</div>
-	</div>  
+	</div> 
+	<div class="row mb-4">
+		<div class="col">
+			<textBlock 
+				cmsWidgetName="QuoteEmailTextBlockWidget" 
+				typeStyle="caption"
+			/>
+		</div>
+	</div> 
 </template>
 
 <script>
@@ -45,6 +53,7 @@ import { defineRule } from "vee-validate";
 import { required } from "@/helpers/validation-rules";
 import { regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
+import textBlock from '@/common-components/text-block/text-block';
 
 // DEFINE VALIDATION RULES
 defineRule("first-name-required", required(errorMessages.FIRST_NAME_REQUIRED));
@@ -87,6 +96,7 @@ export default ({
 	components: {
 		addressQuestions,
 		textboxQuestion,
+		textBlock
 	}
 })
 </script>
\ No newline at end of file
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 1b163ef30..b5e4265bc 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -46,6 +46,14 @@
             />
           </div>
         </div>
+        <div class="row my-2">
+          <div class="col">
+            <textBlock 
+              cmsWidgetName="QuoteEmailTextBlockWidget" 
+              typeStyle="caption"
+            />
+          </div>
+        </div>        
         <alert 
           v-if="displayInvalidZipAlert" 
           class="my-3"           
@@ -109,6 +117,7 @@ import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-he
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
 import loadingModal from "@/common-components/loading-modal/loading-modal.vue";
+import textBlock from '@/common-components/text-block/text-block';
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -360,7 +369,8 @@ export default {
     funnelSubHeader,
     textboxQuestion,
     alert,    
-    loadingModal,    
+    loadingModal,
+    textBlock,    
     Form
   },
 };
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 4f2748a5e..6e8a38351 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -56,6 +56,14 @@
             />
           </div>
         </div>
+        <div class="row my-2">
+          <div class="col">
+            <textBlock 
+              cmsWidgetName="QuoteEmailTextBlockWidget"
+              typeStyle="caption"
+            />
+          </div>
+        </div>
         <alert ref="alertInvalidZip"
           v-if="displayInvalidZipAlert"
           class="my-4"
@@ -124,6 +132,7 @@ import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
 import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information";
 import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
+import textBlock from '@/common-components/text-block/text-block';
 
 // Supporting files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
@@ -396,6 +405,7 @@ export default {
     alert,
     vinInformation,
     loadingModal,
+    textBlock,
     Form,
   },
 };

From 21d4b4884ac2128d1987e9765132b56bfc852a2f Mon Sep 17 00:00:00 2001
From: Mark Harris <mark.harris@safelite.com>
Date: Tue, 13 Sep 2022 09:25:51 -0400
Subject: [PATCH 3/6] fixed remaining merge conflict

---
 .../text-block/text-block.vue.orig            | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/common-components/text-block/text-block.vue.orig

diff --git a/src/common-components/text-block/text-block.vue.orig b/src/common-components/text-block/text-block.vue.orig
new file mode 100644
index 000000000..33d81d43c
--- /dev/null
+++ b/src/common-components/text-block/text-block.vue.orig
@@ -0,0 +1,41 @@
+<template>
+  <div class="text-block d-flex w-100 mt-4" :class="[justifyText, typeStyle, fontWeight]" v-html="this.TextBlockCopy"></div>
+</template>
+
+<script>
+export default {
+  name: 'textBlock',
+  props: {
+    justifyText: String,// left, right, center
+    typeStyle: String, // h1-h6, body, small, label, caption (see Figma or Confluence documentation)
+    fontWeight: String,// bold=500, default is 400
+    cmsWidgetName: String,
+  },
+  computed: {
+      TextBlockCopy(){
+        return this.getCmsContent(this.cmsWidgetName, "Text");
+      },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+  .text-block {
+    &.left {
+      justify-content: flex-start;
+    }
+    &.right {
+      justify-content: flex-end;
+    }
+    &.center {
+      justify-content: center;
+    }
+    &.bold {
+      font-weight: 500;
+    }
+  }
+<<<<<<< HEAD
+</style>
+=======
+</style>
+>>>>>>> d1bf013... fixed remaining merge conflict

From c0da21419e0f18d03051b5eaa893fa41451fde8c Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 13 Sep 2022 08:56:36 -0400
Subject: [PATCH 4/6] Added quote email message to estimate page and changed
 top / bottom margins to more accurately reflect Figma

---
 src/common-components/text-block/text-block.vue  |  2 +-
 .../customer-questions/customer-questions.vue    |  2 +-
 src/layouts/estimate/estimate.vue                | 16 +++++++++++++++-
 .../license-plate-lookup.vue                     |  4 ++--
 src/layouts/vin-lookup/vin-lookup.vue            |  4 ++--
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/common-components/text-block/text-block.vue b/src/common-components/text-block/text-block.vue
index 26f57d665..f8d14cd44 100644
--- a/src/common-components/text-block/text-block.vue
+++ b/src/common-components/text-block/text-block.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="text-block d-flex w-100 mt-4" :class="[justifyText, typeStyle, fontWeight]" v-html="this.TextBlockCopy"></div>
+  <div class="text-block d-flex w-100 mt-2" :class="[justifyText, typeStyle, fontWeight]" v-html="this.TextBlockCopy"></div>
 </template>
 
 <script>
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index defcbe5e2..e837f26fc 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -24,7 +24,7 @@
 			/>
 		</div>
 	</div>
-	<div class="row mb-4">
+	<div class="row mt-4">
 		<div class="col">
 			<textboxQuestion
 				cmsWidgetName="EmailAddressQuestionWidget"
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index cfd904da1..e003348bd 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -47,7 +47,7 @@
               />
             </div>
           </div>
-          <div class="row my-2">
+          <div class="row mt-2">
             <div class="col">
               <textboxQuestion
                 cmsWidgetName="EmailAddressQuestionWidget"
@@ -59,6 +59,14 @@
               />
             </div>
           </div>
+          <div class="row mb-2">
+            <div class="col">
+              <textBlock 
+                cmsWidgetName="QuoteEmailTextBlockWidget" 
+                typeStyle="caption"
+              />
+            </div>
+          </div>
           <alert ref="alertInvalidZip"
             v-if="displayInvalidZipAlert"
             class="my-4"
@@ -89,6 +97,7 @@
 </template>
 
 <script>
+
 // Components
 import funnelHeader from "@/common-components/funnel-header/funnel-header";
 import funnelFooter from "@/common-components/funnel-footer/funnel-footer";
@@ -98,6 +107,8 @@ import buttonQuestion from "@/common-components/button-question/button-question"
 import alert from "@/ux-components/alert/alert";
 import textboxQuestion from "@/common-components/textbox-question/textbox-question";
 import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
+import textBlock from "@/common-components/text-block/text-block";
+
 //Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
@@ -108,12 +119,14 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
 import { vinLookupMethodSelections } from "@/constants/vin-lookup-method-selections.js";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
 defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
 defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED));
 defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT));
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
+
 export default {
   name: "estimate",
   data() {
@@ -238,6 +251,7 @@ export default {
     alert,
     textboxQuestion,
     loadingModal,
+    textBlock
   },
 };
 </script>
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index b5e4265bc..90a447258 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -36,7 +36,7 @@
             />
           </div>
         </div>
-        <div class="row my-2">
+        <div class="row mt-2">
           <div class="col">
             <textboxQuestion
               cmsWidgetName="EmailAddressQuestionWidget"
@@ -46,7 +46,7 @@
             />
           </div>
         </div>
-        <div class="row my-2">
+        <div class="row mb-2">
           <div class="col">
             <textBlock 
               cmsWidgetName="QuoteEmailTextBlockWidget" 
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 6e8a38351..ff0e97f66 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -44,7 +44,7 @@
             />
           </div>
         </div>
-        <div class="row my-2">
+        <div class="row mt-2">
           <div class="col">
             <textboxQuestion
               cmsWidgetName="EmailAddressQuestionWidget"
@@ -56,7 +56,7 @@
             />
           </div>
         </div>
-        <div class="row my-2">
+        <div class="row mb-2">
           <div class="col">
             <textBlock 
               cmsWidgetName="QuoteEmailTextBlockWidget"

From ff2a68bb6258064cda6da71d285d5f36ac71ae31 Mon Sep 17 00:00:00 2001
From: AdamCaouetteSafelite
 <91896960+AdamCaouetteSafelite@users.noreply.github.com>
Date: Tue, 13 Sep 2022 15:02:19 -0400
Subject: [PATCH 5/6] Revert "CSR-818: add focus style for greyed out button"

---
 src/styles/common-error-styles.scss | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index a3c4a6ef8..25a651d52 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -138,13 +138,11 @@ html {
       pointer-events: all;
       font-weight: $font-weight-normal;
     }
-    &.btn.btn-primary:hover {
+    &.btn.btn-primary:hover,
+    &.btn.btn-primary:focus,
+    &.btn.btn-primary:focus-visible {
       background: $gray-200;
       box-shadow: none;
     }
-    &.btn.btn-primary:focus,
-    &.btn.btn-primary:focus-visible {
-      box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $blue-700;
-    }
   }
 }

From 4ccfa5e3f0d547fa6b57e12b37f72e90ca69eec0 Mon Sep 17 00:00:00 2001
From: Leah Schumann <leah.schumann@safelite.com>
Date: Tue, 13 Sep 2022 15:05:00 -0400
Subject: [PATCH 6/6] Remove text-block.orig file

---
 .../text-block/text-block.vue.orig            | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 src/common-components/text-block/text-block.vue.orig

diff --git a/src/common-components/text-block/text-block.vue.orig b/src/common-components/text-block/text-block.vue.orig
deleted file mode 100644
index 33d81d43c..000000000
--- a/src/common-components/text-block/text-block.vue.orig
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div class="text-block d-flex w-100 mt-4" :class="[justifyText, typeStyle, fontWeight]" v-html="this.TextBlockCopy"></div>
-</template>
-
-<script>
-export default {
-  name: 'textBlock',
-  props: {
-    justifyText: String,// left, right, center
-    typeStyle: String, // h1-h6, body, small, label, caption (see Figma or Confluence documentation)
-    fontWeight: String,// bold=500, default is 400
-    cmsWidgetName: String,
-  },
-  computed: {
-      TextBlockCopy(){
-        return this.getCmsContent(this.cmsWidgetName, "Text");
-      },
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-  .text-block {
-    &.left {
-      justify-content: flex-start;
-    }
-    &.right {
-      justify-content: flex-end;
-    }
-    &.center {
-      justify-content: center;
-    }
-    &.bold {
-      font-weight: 500;
-    }
-  }
-<<<<<<< HEAD
-</style>
-=======
-</style>
->>>>>>> d1bf013... fixed remaining merge conflict