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

CASH-185

Browse source 
CASH-185 fixed import conflict
This commit is contained in:
Johnny shultz 2025-02-24 10:58:17 -05:00
parent ea03889bb1
commit 63de7f959f
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/experiment-components/service-package-radio.vue
View file

@ -208,7 +208,7 @@ export default {
} }
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
&:before { &:before {
top: .5rem; top: 0.5rem;
} }
&:after { &:after {
top: 1.4375rem; top: 1.4375rem;
@ -223,7 +223,7 @@ export default {
+ .package-label.pricing-by-day-pkg-lbl-ins { + .package-label.pricing-by-day-pkg-lbl-ins {
&:before { &:before {
top: .3125rem; top: 0.3125rem;
} }
&:after { &:after {
top: 1.25rem; top: 1.25rem;
@ -234,7 +234,7 @@ export default {
&:before { &:before {
top: 0.9375rem; top: 0.9375rem;
@include media-breakpoint-up(lg) { @include media-breakpoint-up(lg) {
top: .3125rem; top: 0.3125rem;
} }
} }
&:after { &:after {

2
src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue
View file

@ -181,7 +181,7 @@ export default {
transition: background 0s 0s ease-in-out; transition: background 0s 0s ease-in-out;
} }
} }
.modal.modal-component .modal-dialog .modal-content { .modal.modal-component .modal-dialog .modal-content {
.modal-header { .modal-header {
padding-top: 0; padding-top: 0;

2
src/layouts/quote/service-package-question/service-package-question.spec.js
View file

@ -851,7 +851,7 @@ function setupMocks({ mountOptionsMockData, props = mockProps }) {
}, },
}, },
}; };
mountOptionsMockData = Object.assign(mountOptionsMockDataDefault, mountOptionsMockData); mountOptionsMockData = Object.assign(mountOptionsMockDataDefault, mountOptionsMockData);
const mountOptions = getMountOptions(mountOptionsMockData); const mountOptions = getMountOptions(mountOptionsMockData);

2
src/layouts/schedule/schedule.vue
View file

@ -95,8 +95,6 @@ import { queryStrings } from "@/constants/query-strings";
import { getQuerystringParameter } from "@/helpers/querystring-helper"; import { getQuerystringParameter } from "@/helpers/querystring-helper";
import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
import baseMixin from "@/mixins/base-mixin.js"; import baseMixin from "@/mixins/base-mixin.js";
import experimentMixin from "@/mixins/experiment-mixin";
import { experimentSettings } from "@/constants/experiments";
import { storeActions } from "@/constants/store-actions"; import { storeActions } from "@/constants/store-actions";
import { settleAllPromises } from "@/helpers/layout-helper"; import { settleAllPromises } from "@/helpers/layout-helper";
import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper"; import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper";