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: 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...
- This process can take up 20 seconds. + This process can take up to 20 seconds.
diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss index 92461bbf2..7ebc9fb28 100644 --- a/src/styles/common-error-styles.scss +++ b/src/styles/common-error-styles.scss @@ -115,14 +115,17 @@ html { color: $red; font-size: .875rem; font-weight: 500; + height: 1.5rem; + margin-top: .25rem !important; } .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/alert/alert.vue b/src/ux-components/alert/alert.vue index c32f22d78..224539fe0 100644 --- a/src/ux-components/alert/alert.vue +++ b/src/ux-components/alert/alert.vue @@ -129,7 +129,7 @@ export default { } } & p { - margin-bottom: 0px; + margin-bottom: 0.25rem !important; } } 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 {