From 31defe304ec1fcc6e0d3da1e767ba6ef4c9b58c9 Mon Sep 17 00:00:00 2001
From: Scott Kiener <scott.kiener@safelite.com>
Date: Fri, 6 May 2022 08:11:48 -0400
Subject: [PATCH] CSR-240 | Fixing merge conflicts

---
 .../license-plate-lookup.vue                  | 132 +++++++++---------
 1 file changed, 67 insertions(+), 65 deletions(-)

diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index e6ad2bf4b..cce368d5c 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -14,76 +14,78 @@
         :displayGenericVehicleImage="false"
       />
       <funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" />
-      <div class="row my-2">
-        <div class="col">
-          <textboxQuestion
-            cmsWidgetName="LicensePlateNumber"
-            v-model="licensePlate"
-            isRequired
-            inputId="license_plate"
-            validationRules="license-plate-required"
-          />
+      <div class="fade-on-route-transition sub-container make-tall">
+        <div class="row my-2">
+          <div class="col">
+            <textboxQuestion
+              cmsWidgetName="LicensePlateNumber"
+              v-model="licensePlate"
+              isRequired
+              inputId="license_plate"
+              validationRules="license-plate-required"
+            />
+          </div>
         </div>
-      </div>
-      <div class="row my-2">
-        <div class="col">
-          <textboxQuestion
-            cmsWidgetName="RegistrationZip"
-            v-model="registrationZip"
-            inputId="zip"
-            mask="#####"
-            validationRules="zip-required"
-          />
+        <div class="row my-2">
+          <div class="col">
+            <textboxQuestion
+              cmsWidgetName="RegistrationZip"
+              v-model="registrationZip"
+              inputId="zip"
+              mask="#####"
+              validationRules="zip-required"
+            />
+          </div>
         </div>
-      </div>
-      <div class="row my-2">
-        <div class="col">
-          <textboxQuestion
-            cmsWidgetName="EmailAddress"
-            v-model="email"
-            inputId="email"
-            validationRules="email-address-required|email-address-format"
-          />
+        <div class="row my-2">
+          <div class="col">
+            <textboxQuestion
+              cmsWidgetName="EmailAddress"
+              v-model="email"
+              inputId="email"
+              validationRules="email-address-required|email-address-format"
+            />
+          </div>
         </div>
-      </div>
-      <alert
-        class="my-3"
-        :manualHeadline="NoServiceZipHeader"
-        :manualCopy="NoServiceZipBody"
-        v-if="!isRegistrationZipServicable && isVinValid && !isCarIdDifferent"
-        alertClass="alert-danger"
-      />
-      <div class="row my-2">
-        <div class="col">
-          <textboxQuestion
-            v-if="!isRegistrationZipServicable"
-            cmsWidgetName="ServiceZip"
-            v-model="serviceZip"
-            inputId="serviceZip"
-            validationRules="zip-required"
-          />
+        <alert
+          class="my-3"
+          :manualHeadline="NoServiceZipHeader"
+          :manualCopy="NoServiceZipBody"
+          v-if="!isRegistrationZipServicable && isVinValid && !isCarIdDifferent"
+          alertClass="alert-danger"
+        />
+        <div class="row my-2">
+          <div class="col">
+            <textboxQuestion
+              v-if="!isRegistrationZipServicable"
+              cmsWidgetName="ServiceZip"
+              v-model="serviceZip"
+              inputId="serviceZip"
+              validationRules="zip-required"
+            />
+          </div>
         </div>
+        <alert
+          class="my-3"
+          cmsWidgetName="NoMatchAlertWidget"
+          v-if="!isVinValid"
+          alertClass="alert-danger"
+        />
+        <alert
+          class="my-3"
+          :manualHeadline="MatchedDifferentVehicleAlertHeader"
+          :manualCopy="MatchedDifferentVehicleAlertBody"
+          v-if="isCarIdDifferent"
+          alertClass="alert-warning"
+        />
+        <funnelFooter
+          ref="funnelFooter"
+          cmsWidgetName="FunnelFooterWidget"
+          :isForwardActionDisabled="!meta.valid"
+          @back-clicked="backButtonAction"
+          @ForwardClicked="forwardButtonAction"
+        />
       </div>
-      <alert
-        class="my-3"
-        cmsWidgetName="NoMatchAlertWidget"
-        v-if="!isVinValid"
-        alertClass="alert-danger"
-      />
-      <alert
-        class="my-3"
-        :manualHeadline="MatchedDifferentVehicleAlertHeader"
-        :manualCopy="MatchedDifferentVehicleAlertBody"
-        v-if="isCarIdDifferent"
-        alertClass="alert-warning"
-      />
-      <funnelFooter
-        ref="funnelFooter"
-        cmsWidgetName="FunnelFooterWidget"
-        :isForwardActionDisabled="!meta.valid"
-        @back-clicked="backButtonAction"
-        @ForwardClicked="forwardButtonAction"
-      />
     </div>
   </Form>
 </template>