diff --git a/kolibri/plugins/facility/assets/src/views/ClassEnrollForm.vue b/kolibri/plugins/facility/assets/src/views/ClassEnrollForm.vue index ccf93336ad3..2f7da371ef6 100644 --- a/kolibri/plugins/facility/assets/src/views/ClassEnrollForm.vue +++ b/kolibri/plugins/facility/assets/src/views/ClassEnrollForm.vue @@ -39,7 +39,6 @@ import { mapState } from 'vuex'; import pickBy from 'lodash/pickBy'; import debounce from 'lodash/debounce'; - import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin'; import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings'; import FilterTextbox from 'kolibri.coreVue.components.FilterTextbox'; import UserTable from 'kolibri.coreVue.components.UserTable'; @@ -54,7 +53,7 @@ UserTable, FilterTextbox, }, - mixins: [commonCoreStrings, responsiveWindowMixin], + mixins: [commonCoreStrings], props: { pageType: { type: String, diff --git a/kolibri/plugins/facility/assets/src/views/DataPage/index.vue b/kolibri/plugins/facility/assets/src/views/DataPage/index.vue index 751c0b1b302..66f1924cd2a 100644 --- a/kolibri/plugins/facility/assets/src/views/DataPage/index.vue +++ b/kolibri/plugins/facility/assets/src/views/DataPage/index.vue @@ -188,7 +188,7 @@ import urls from 'kolibri.urls'; import { FacilityResource } from 'kolibri.resources'; import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings'; - import KResponsiveWindowMixin from 'kolibri-design-system/lib/KResponsiveWindowMixin'; + import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; import validationConstants from 'kolibri-design-system/lib/KDateRange/validationConstants'; import { currentLanguage } from 'kolibri.utils.i18n'; import { now } from 'kolibri.utils.serverClock'; @@ -218,7 +218,11 @@ LearnMoreModal, KDateRange, }, - mixins: [commonCoreStrings, KResponsiveWindowMixin], + mixins: [commonCoreStrings], + setup() { + const { windowIsMedium, windowIsSmall } = useKResponsiveWindow(); + return { windowIsMedium, windowIsSmall }; + }, data() { return { showLearnMoreSummaryModal: false, diff --git a/kolibri/plugins/facility/assets/src/views/FacilityConfigPage/index.vue b/kolibri/plugins/facility/assets/src/views/FacilityConfigPage/index.vue index 1f130e81e0c..ea2501a95ef 100644 --- a/kolibri/plugins/facility/assets/src/views/FacilityConfigPage/index.vue +++ b/kolibri/plugins/facility/assets/src/views/FacilityConfigPage/index.vue @@ -213,7 +213,7 @@