CASH-185
CASH-185 fixed import conflict
This commit is contained in:
parent
ea03889bb1
commit
63de7f959f
4 changed files with 5 additions and 7 deletions
|
|
@ -208,7 +208,7 @@ export default {
|
|||
}
|
||||
@include media-breakpoint-up(lg) {
|
||||
&:before {
|
||||
top: .5rem;
|
||||
top: 0.5rem;
|
||||
}
|
||||
&:after {
|
||||
top: 1.4375rem;
|
||||
|
|
@ -223,7 +223,7 @@ export default {
|
|||
|
||||
+ .package-label.pricing-by-day-pkg-lbl-ins {
|
||||
&:before {
|
||||
top: .3125rem;
|
||||
top: 0.3125rem;
|
||||
}
|
||||
&:after {
|
||||
top: 1.25rem;
|
||||
|
|
@ -234,7 +234,7 @@ export default {
|
|||
&:before {
|
||||
top: 0.9375rem;
|
||||
@include media-breakpoint-up(lg) {
|
||||
top: .3125rem;
|
||||
top: 0.3125rem;
|
||||
}
|
||||
}
|
||||
&:after {
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ export default {
|
|||
transition: background 0s 0s ease-in-out;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.modal.modal-component .modal-dialog .modal-content {
|
||||
.modal-header {
|
||||
padding-top: 0;
|
||||
|
|
|
|||
|
|
@ -851,7 +851,7 @@ function setupMocks({ mountOptionsMockData, props = mockProps }) {
|
|||
},
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
mountOptionsMockData = Object.assign(mountOptionsMockDataDefault, mountOptionsMockData);
|
||||
const mountOptions = getMountOptions(mountOptionsMockData);
|
||||
|
||||
|
|
|
|||
|
|
@ -95,8 +95,6 @@ import { queryStrings } from "@/constants/query-strings";
|
|||
import { getQuerystringParameter } from "@/helpers/querystring-helper";
|
||||
import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
|
||||
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 { settleAllPromises } from "@/helpers/layout-helper";
|
||||
import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper";
|
||||
|
|
|
|||
Loading…
Reference in a new issue