jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/CSR-18

Browse source
This commit is contained in:
CarlNation 2022-04-21 13:16:15 -04:00
commit d25e779dba
3 changed files with 105 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common-components/button-question/button-question.vue
View file

@ -35,6 +35,7 @@
:selectedValues="selectedValues" :selectedValues="selectedValues"
data-test="button" data-test="button"
:validationRules="validationRules" :validationRules="validationRules"
:class="[suppressError ? 'alertError' : '']"
/> />
</div> </div>
</fieldset> </fieldset>

2
src/layouts/vehicle-damage/vehicle-damage.vue
View file

@ -281,7 +281,7 @@ export default {
navigateForward(partsData){ navigateForward(partsData){
// Temporary easter egg to navigate to heritage funnel. // Temporary easter egg to navigate to heritage funnel.
const vehicleYearsToShowHeritageFunnel = [ 2001, 2002, 2010 ]; const vehicleYearsToShowHeritageFunnel = [ 2001, 2002, 2010, 2016 ];
if (vehicleYearsToShowHeritageFunnel.includes(store.getters.vehicle.year)) { if (vehicleYearsToShowHeritageFunnel.includes(store.getters.vehicle.year)) {
navigateToHeritageFunnel(); navigateToHeritageFunnel();
return; return;

51
src/styles/common-error-styles.scss
View file

@ -1,4 +1,5 @@
.has-error { html {
.has-error {
&.list-button, &.list-button,
&.list-card { &.list-card {
border: 1px solid $red; border: 1px solid $red;
@ -8,11 +9,11 @@
box-shadow: 0 0 0 2.5px $red; box-shadow: 0 0 0 2.5px $red;
} }
input[type=checkbox]:checked + label { input[type=checkbox]:checked + label {
box-shadow: 0 0 0 1px $red !important; box-shadow: 0 0 0 1px $red;
} }
&:hover { &:hover {
box-shadow: 0px 0px 0px 4px $red-200; box-shadow: 0px 0px 0px 4px $red-200;
border-radius: 10px !important; border-radius: 10px;
} }
} }
&.list-button-horizontal { &.list-button-horizontal {
@ -25,7 +26,7 @@
} }
input[type=checkbox]:focus + label, input[type=checkbox]:focus + label,
input[type=radio]:focus + label { input[type=radio]:focus + label {
box-shadow: 0 0 1px $red !important; box-shadow: 0 0 1px $red;
} }
} }
&.ui-radio, &.ui-radio,
@ -59,15 +60,43 @@
background-size: 16px 12px; background-size: 16px 12px;
} }
} }
} }
//Restore to default style if alert box is present
.alertError {
.has-error {
&.list-button,
&.list-card {
border: 1px solid $gray-500;
input:not(:focus) {
+ label {
box-shadow: 0 0 0 1px $gray-500;
border-radius: .5rem;
}
}
input:focus {
border: 1px solid $gray-500;
+ label {
box-shadow: 0 0 0 2.5px transparent;
}
}
&:hover {
box-shadow: 0 0 0 4px $blue-300;
+ label {
box-shadow: 0 0 0 2.5px transparent;
border: 1px solid $blue;
}
}
}
}
}
.form-test-error { .form-test-error {
color: $red; color: $red;
font-size: .875rem; font-size: .875rem;
font-weight: 500; font-weight: 500;
} }
.form-test-invalid { .form-test-invalid {
&.btn.btn-primary { &.btn.btn-primary {
color: $gray; color: $gray;
background: $gray-200; background: $gray-200;
@ -78,8 +107,8 @@
&.btn.btn-primary:focus, &.btn.btn-primary:focus,
&.btn.btn-primary:focus-visible { &.btn.btn-primary:focus-visible {
color: $gray !important; color: $gray !important;
background: $gray-200 !important; background: $gray-200;
box-shadow: none !important; box-shadow: none;
}
} }
} }