[tmp] Point to fork KDS and freeze the loader

learningequality · Apr 25, 2023 · 2cc6b36 · 2cc6b36
1 parent 28deada
commit 2cc6b36
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/kolibri/core/package.json b/kolibri/core/package.json
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.1",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.1.42",
-    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#a671f6f898eef07a3167dc74648ef329f8e3af44",
+    "kolibri-design-system": "https://github.com/MisRob/kolibri-design-system#db526d2c40a12c121c9c6edc0898292d3936bd4d",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",

diff --git a/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue b/kolibri/plugins/learn/assets/src/views/LearningActivityBar.vue
@@ -33,9 +33,11 @@
 
       <template #actions>
         <Transition name="downloading-loader">
-          <span v-if="showDownloadingLoader">
+          <span>
             <KCircularLoader
               ref="downloadingLoader"
+              :show="showDownloadingLoader"
+              :freeze="3000"
               data-test="downloadingLoader"
               :size="24"
               :style="{ margin: '10px 4px 0px 4px' }"

diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
@@ -24,7 +24,7 @@
     "intl": "^1.2.4",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.1.42",
-    "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#a671f6f898eef07a3167dc74648ef329f8e3af44",
+    "kolibri-design-system": "https://github.com/MisRob/kolibri-design-system#db526d2c40a12c121c9c6edc0898292d3936bd4d",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",

diff --git a/yarn.lock b/yarn.lock
@@ -7390,9 +7390,9 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.1.42.tgz#2f62a8d8b8894e5cfbd47ee6564b31018818c93f"
   integrity sha512-2hUxYnzUEfhLFJO9egVSwYW8/PKob9wLeDYfB74mtIzgQ4zy6huRj3574WetK9gREi+W1Jcm7HGPsfZIFzFvrA==
 
-"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#a671f6f898eef07a3167dc74648ef329f8e3af44":
+"kolibri-design-system@https://github.com/MisRob/kolibri-design-system#db526d2c40a12c121c9c6edc0898292d3936bd4d":
   version "1.3.0"
-  resolved "https://github.com/learningequality/kolibri-design-system#a671f6f898eef07a3167dc74648ef329f8e3af44"
+  resolved "https://github.com/MisRob/kolibri-design-system#db526d2c40a12c121c9c6edc0898292d3936bd4d"
   dependencies:
     aphrodite "https://github.com/learningequality/aphrodite/"
     autosize "^3.0.21"
@@ -7404,6 +7404,7 @@ [email protected]:
     popper.js "^1.14.6"
     purecss "^0.6.2"
     tippy.js "^4.2.1"
+    vue-intl "^3.1.0"
 
 launch-editor-middleware@^2.5.0:
   version "2.6.0"
@@ -11090,7 +11091,7 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
-[email protected]:
+[email protected], vue-intl@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/vue-intl/-/vue-intl-3.1.0.tgz#707f1f7406595c9b4afc6049254b333093be37be"
   integrity sha512-0v3S5gspuYnt6j1G+KLfPUsNnjRdbMOcYrWYoSd1gYk6rX8VuOyh7NLztPrSIJt+NLs/qzLOZXxI1LORukEiqA==