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

Merge pull request #308 from Safelite/CSR-269-qa-fixes

Browse source 
CSR-269 fix rounded border, error border color and size, alert positi…
This commit is contained in:
bmauger 2022-03-29 16:33:14 -04:00 committed by GitHub
commit 5cb4c52dec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common-components/funnel-header/funnel-header.vue
View file

@ -66,4 +66,7 @@ export default {
.logo-image { .logo-image {
max-width: 78px; max-width: 78px;
} }
.alert {
left: 0;
}
</style> </style>

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

@ -5,7 +5,7 @@
ref="theForm" ref="theForm"
v-slot="{ meta }" v-slot="{ meta }"
> >
<div class="container-fluid shadow rounded-3 p-2 position-relative make-tall"> <div class="container-fluid shadow rounded-3 px-5 p-2 position-relative make-tall">
<funnelHeader ref="funnelHeader" /> <funnelHeader ref="funnelHeader" />
<vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage=false /> <vehicleBanner ref="vehicleBanner" :displayGenericVehicleImage=false />
<funnelSubHeader ref="funnelSubHeader" /> <funnelSubHeader ref="funnelSubHeader" />
@ -285,7 +285,7 @@ export default {
}, },
navigateForward(partsData){ navigateForward(partsData){
// CSR-98 TEMP // CSR-98 TEMP
if (store.getters.vehicle.year == 2010) { if (store.getters.vehicle.year == 2010) {
navigateToHeritageFunnel(); navigateToHeritageFunnel();
return; return;
@ -393,15 +393,15 @@ export default {
hasSplitSingleConflict() { hasSplitSingleConflict() {
if (!this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false; if (!this.selectedWindshieldOptions.selectedWindshieldReplaceOptions) return false;
return this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedSingleWindshield => return this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedSingleWindshield =>
{ {
return selectedSingleWindshield.toUpperCase() === damageLocationsSelected.SINGLE.toUpperCase(); return selectedSingleWindshield.toUpperCase() === damageLocationsSelected.SINGLE.toUpperCase();
}) && }) &&
(this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedDriverWindshield => (this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedDriverWindshield =>
{ {
return selectedDriverWindshield.toUpperCase() === damageLocationsSelected.DRIVER.toUpperCase(); return selectedDriverWindshield.toUpperCase() === damageLocationsSelected.DRIVER.toUpperCase();
}) || }) ||
this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedPassengerWindshield => this.selectedWindshieldOptions.selectedWindshieldReplaceOptions.some(selectedPassengerWindshield =>
{ {
return selectedPassengerWindshield.toUpperCase() === damageLocationsSelected.PASSENGER.toUpperCase(); return selectedPassengerWindshield.toUpperCase() === damageLocationsSelected.PASSENGER.toUpperCase();
}) })

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

@ -11,6 +11,11 @@
input[type=radio]:focus + label { input[type=radio]:focus + label {
box-shadow: 0 0 0 2.5px $red; box-shadow: 0 0 0 2.5px $red;
} }
&:hover {
box-shadow: 0px 0px 0px 4px $red-200;
border-radius: 10px !important;
}
} }
input[type=checkbox]:checked + label, input[type=checkbox]:checked + label,
@ -21,6 +26,9 @@
color: $red; color: $red;
label { label {
border: 1px solid $red; border: 1px solid $red;
&:hover {
box-shadow: 0px 0px 0px 4px $red-200;
}
} }
input[type=checkbox]:focus + label, input[type=checkbox]:focus + label,
input[type=radio]:focus + label { input[type=radio]:focus + label {