diff --git a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue index 8dcf45af1b0..a35e4b6a532 100644 --- a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue +++ b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue @@ -139,7 +139,6 @@ import omit from 'lodash/omit'; import some from 'lodash/some'; import uniqBy from 'lodash/uniqBy'; - import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin'; import ImmersivePage from 'kolibri.coreVue.components.ImmersivePage'; import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings'; import { TaskResource } from 'kolibri.resources'; @@ -176,7 +175,7 @@ SelectionBottomBar, UiAlert, }, - mixins: [commonCoreStrings, commonDeviceStrings, responsiveWindowMixin, taskNotificationMixin], + mixins: [commonCoreStrings, commonDeviceStrings, taskNotificationMixin], setup() { useContentTasks(); }, diff --git a/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue b/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue index 6727bfc97f7..344d93019b0 100644 --- a/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue +++ b/kolibri/plugins/device/assets/src/views/DeviceInfoPage.vue @@ -81,7 +81,7 @@ import { mapGetters, mapState } from 'vuex'; import TechnicalTextBlock from 'kolibri-common/components/AppError/TechnicalTextBlock'; import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings'; - import responsiveWindowMixin from 'kolibri.coreVue.mixins.responsiveWindowMixin'; + import useKResponsiveWindow from 'kolibri-design-system/lib/useKResponsiveWindow'; import DeviceAppBarPage from './DeviceAppBarPage'; import { deviceString } from './commonDeviceStrings'; import DeviceNameModal from './DeviceNameModal'; @@ -98,7 +98,13 @@ DeviceNameModal, TechnicalTextBlock, }, - mixins: [commonCoreStrings, responsiveWindowMixin], + mixins: [commonCoreStrings], + setup() { + const { windowIsSmall } = useKResponsiveWindow(); + return { + windowIsSmall, + }; + }, data() { return { advancedShown: false, diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue index 92622943283..58f4f0df87e 100644 --- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue +++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue @@ -193,7 +193,7 @@