fixes while rebasing

learningequality · Nov 1, 2023 · 0e05f90 · 0e05f90
1 parent b7f9309
commit 0e05f90
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/ActivityFilter.vue b/kolibri/plugins/learn/assets/src/my_downloads/views/Filters/ActivityFilter.vue
@@ -10,10 +10,10 @@
     @change="handleActivityTypeChange($event.value)"
   >
     <template #display>
-        <KLabeledIcon
-          :label="selected.label"
-          :icon="selected.icon"
-        />
+      <KLabeledIcon
+        :label="selected.label"
+        :icon="selected.icon"
+      />
     </template>
     <template #option="{ option }">
       <KLabeledIcon

diff --git a/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue b/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue
@@ -200,7 +200,6 @@
       SuggestedTime,
       DeviceConnectionStatus,
     },
-    mixins: [KResponsiveWindowMixin, commonLearnStrings],
     filters: {
       truncateText(value, maxLength) {
         if (value && value.length > maxLength) {
@@ -209,6 +208,7 @@
         return value;
       },
     },
+    mixins: [commonLearnStrings, commonCoreStrings],
     setup() {
       const { windowBreakpoint } = useKResponsiveWindow();
       return {

diff --git a/kolibri/plugins/learn/assets/src/views/LibraryAndChannelBrowserMainContent.vue b/kolibri/plugins/learn/assets/src/views/LibraryAndChannelBrowserMainContent.vue
@@ -50,8 +50,6 @@
       ResourceCard,
     },
 
-    mixins: [responsiveWindowMixin],
-
     setup() {
       const {
         genContentLinkBackLinkCurrentPage,

diff --git a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
@@ -157,6 +157,7 @@
   import { get, set } from '@vueuse/core';
   import lodashGet from 'lodash/get';
   import { getCurrentInstance, ref, watch } from 'kolibri.lib.vueCompositionApi';
+  import Modalities from 'kolibri-constants/Modalities';
 
   import AuthMessage from 'kolibri.coreVue.components.AuthMessage';
   import { ContentNodeResource } from 'kolibri.resources';