Merge pull request #8775 from indirectlylit/modal

update to language modal
learningequality · Nov 29, 2021 · bbc7972 · bbc7972
2 parents 2325aa7 + c54cbfd
commit bbc7972
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue b/kolibri/core/assets/src/views/language-switcher/LanguageSwitcherModal.vue
@@ -4,6 +4,7 @@
     :title="$tr('changeLanguageModalHeader')"
     :submitText="coreString('confirmAction')"
     :cancelText="coreString('cancelAction')"
+    :size="600"
     @cancel="cancel"
     @submit="setLang"
   >

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
@@ -20,7 +20,7 @@
     "intl": "^1.2.4",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "^0.1.34",
-    "kolibri-design-system": "git://github.com/learningequality/kolibri-design-system#632240f0b11f37c8b18de5ed930a4bf66b7c3678",
+    "kolibri-design-system": "git://github.com/learningequality/kolibri-design-system#v1.2.0",
     "lockr": "0.8.4",
     "lodash": "^4.17.21",
     "loglevel": "^1.4.1",

diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json
@@ -15,14 +15,15 @@
     "core-js": "^3.13",
     "csv-generator-client": "^2.1.1",
     "date-fns": "^1.28.2",
+    "deep-object-diff": "^1.1.0",
     "fontfaceobserver": "^2.0.13",
     "frame-throttle": "^3.0.0",
     "fuse.js": "^6.4.6",
     "hammerjs": "^2.0.8",
     "intl": "^1.2.4",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "^0.1.34",
-    "kolibri-design-system": "git://github.com/learningequality/kolibri-design-system#632240f0b11f37c8b18de5ed930a4bf66b7c3678",
+    "kolibri-design-system": "git://github.com/learningequality/kolibri-design-system#v1.2.0",
     "lockr": "0.8.4",
     "lodash": "^4.17.21",
     "loglevel": "^1.4.1",
@@ -41,4 +42,4 @@
     "vuex-router-sync": "^5.0.0",
     "xstate": "^4.20.2"
   }
-}
+}
diff --git a/yarn.lock b/yarn.lock
@@ -8838,9 +8838,9 @@ kolibri-constants@^0.1.34:
   resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.1.34.tgz#06d1cdb04ded4e4ce785437f3e4bd87801168fae"
   integrity sha512-nArDgIwIPYJMacVaqHazptLRpIjSTS6LNr4FWtL/7D6Ek+z7DVcWtFYL74hH/wdebGykWywmkOa5qnfcy1JQ+A==
 
-"kolibri-design-system@git://github.com/learningequality/kolibri-design-system#632240f0b11f37c8b18de5ed930a4bf66b7c3678":
-  version "0.2.2-beta-2"
-  resolved "git://github.com/learningequality/kolibri-design-system#632240f0b11f37c8b18de5ed930a4bf66b7c3678"
+"kolibri-design-system@git://github.com/learningequality/kolibri-design-system#v1.2.0":
+  version "1.2.0"
+  resolved "git://github.com/learningequality/kolibri-design-system#718831f11eb327b4fc5929a9e62231c6ce42b072"
   dependencies:
     aphrodite "https://github.com/learningequality/aphrodite/"
     autosize "^3.0.21"