From 0e05f904aba231e659ccebfa962adbd255611745 Mon Sep 17 00:00:00 2001
From: thesujai <b210031@nitsikkim.ac.in>
Date: Mon, 9 Oct 2023 20:51:16 +0530
Subject: [PATCH] fixes while rebasing

---
 .../src/my_downloads/views/Filters/ActivityFilter.vue     | 8 ++++----
 .../learn/assets/src/views/LearningActivityBar.vue        | 2 +-
 .../src/views/LibraryAndChannelBrowserMainContent.vue     | 2 --
 .../plugins/learn/assets/src/views/TopicsContentPage.vue  | 1 +
 4 files changed, 6 insertions(+), 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
index d25d51561a3..5f09bbfa594 100644
--- 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
index db81f8e4d9a..cdf760849c6 100644
--- 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
index 6a214ea7d9b..8518ac2dba5 100644
--- 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
index d21fc7f8e9b..b1a8e180017 100644
--- 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';