From 447284958c5290c348d36920e279885850b8cb76 Mon Sep 17 00:00:00 2001
From: FrankRua <frank.rua@safelite.com>
Date: Wed, 11 May 2022 09:06:24 -0400
Subject: [PATCH 1/5] branch selection

---
 azure-pipelines.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 036eb3d23..f11da4951 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -30,6 +30,7 @@ resources:
 
 variables:
   - group: Digital-Infrastructure
+  - group: FixMyGlass-BuildBranches
 
 stages:
   # PR's
@@ -47,6 +48,7 @@ stages:
   # Dev Build/Deploy
   - ${{ else }}:
     - stage: Dev
+      condition: eq(variables['Build.SourceBranch'], variables['dev-branch'] )
       variables:
         - group: FixMyGlassDev
       jobs:
@@ -88,6 +90,7 @@ stages:
 
   # QA Build/Deploy
     - stage: Qa
+      condition: eq(variables['Build.SourceBranch'], variables['qa-branch'] )
       variables:
         - group: FixMyGlassQa
       jobs:

From 13e2d2007837569c4a0c88697929531917d37426 Mon Sep 17 00:00:00 2001
From: FrankRua <frank.rua@safelite.com>
Date: Wed, 11 May 2022 10:04:33 -0400
Subject: [PATCH 2/5] Fix button for defect

---
 src/styles/common-error-styles.scss       | 3 ++-
 src/ux-components/text-link/text-link.vue | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index 92461bbf2..11868d3cf 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -119,10 +119,11 @@ html {
 
   .form-test-invalid {
     &.btn.btn-primary {
-      color: $gray;
+      color: $gray-600;
       background: $gray-200;
       cursor: pointer;
       pointer-events: all;
+      font-weight: $font-weight-normal;
     }
     &.btn.btn-primary:hover,
     &.btn.btn-primary:focus,
diff --git a/src/ux-components/text-link/text-link.vue b/src/ux-components/text-link/text-link.vue
index b39958b21..d338b9d44 100644
--- a/src/ux-components/text-link/text-link.vue
+++ b/src/ux-components/text-link/text-link.vue
@@ -44,7 +44,6 @@ a {
   &.navigation-link {
     color: $black;
     line-height: 26px;
-    text-transform: capitalize;
     white-space: nowrap;
   }
   &.footer-link {

From 73d32f7c80ab0854c9196f1e59e90abb2bec5645 Mon Sep 17 00:00:00 2001
From: CarlNation <carl.nation@safelite.com>
Date: Wed, 11 May 2022 10:08:59 -0400
Subject: [PATCH 3/5] DE-520 typo

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

diff --git a/src/common-components/loading-modal/loading-modal.vue b/src/common-components/loading-modal/loading-modal.vue
index bcdb4454c..741800792 100644
--- a/src/common-components/loading-modal/loading-modal.vue
+++ b/src/common-components/loading-modal/loading-modal.vue
@@ -10,7 +10,7 @@
             Please wait...
         </div>
         <div class="text-center fs-5 loading-modal-text">
-            This process can take up 20 seconds.
+            This process can take up to 20 seconds.
         </div>
        </section>
     </div>

From 9115fc1e7d4ab98c4583726e5c7594f410fb3b46 Mon Sep 17 00:00:00 2001
From: Donielle Austin <Donielle.Austin@safelite.com>
Date: Wed, 11 May 2022 11:40:13 -0400
Subject: [PATCH 4/5] update error message

---
 src/styles/common-error-styles.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss
index 92461bbf2..be8c875d6 100644
--- a/src/styles/common-error-styles.scss
+++ b/src/styles/common-error-styles.scss
@@ -115,6 +115,8 @@ html {
     color: $red;
     font-size: .875rem;
     font-weight: 500;
+    height: 1.5rem; 
+    margin-top: .25rem !important; 
   }
 
   .form-test-invalid {

From 6668e762dcbac720410f08e32e5d9f80670340cf Mon Sep 17 00:00:00 2001
From: Donielle Austin <Donielle.Austin@safelite.com>
Date: Wed, 11 May 2022 12:27:04 -0400
Subject: [PATCH 5/5] ui defect

---
 src/ux-components/alert/alert.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ux-components/alert/alert.vue b/src/ux-components/alert/alert.vue
index 7cd719ba7..9b11041d1 100644
--- a/src/ux-components/alert/alert.vue
+++ b/src/ux-components/alert/alert.vue
@@ -130,7 +130,7 @@ export default {
   }
   & p {
     font-size: 14px;
-    margin-bottom: 0px;
+    margin-bottom: 0.25rem !important;
   }
 }
 </style>