Merge pull request #12154 from rtibbles/theming_miss

Fix some missed updates in theming
learningequality · May 13, 2024 · f5e9d6d · f5e9d6d
2 parents 6daf78c + e239cbe
commit f5e9d6d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/kolibri/core/assets/src/styles/themeSpec.js b/kolibri/core/assets/src/styles/themeSpec.js
@@ -3,23 +3,12 @@ import isObject from 'lodash/isObject';
 
 const logging = logger.getLogger(__filename);
 
-function _colorScaleValidator(value) {
+function _brandColorScaleValidator(value) {
   if (!isObject(value)) {
     logging.error(`Expected object but got '${value}'`);
     return false;
   }
-  const COLOR_NAMES = [
-    'v_50',
-    'v_100',
-    'v_200',
-    'v_300',
-    'v_400',
-    'v_500',
-    'v_600',
-    'v_700',
-    'v_800',
-    'v_900',
-  ];
+  const COLOR_NAMES = ['v_200', 'v_400', 'v_600', 'v_800', 'v_1000', 'v_1100'];
   for (const colorName of COLOR_NAMES) {
     if (!value[colorName]) {
       logging.error(`${colorName} '${name}' not defined by theme`);
@@ -60,12 +49,12 @@ export default {
       primary: {
         type: Object,
         required: true,
-        validator: _colorScaleValidator,
+        validator: _brandColorScaleValidator,
       },
       secondary: {
         type: Object,
         required: true,
-        validator: _colorScaleValidator,
+        validator: _brandColorScaleValidator,
       },
     },
   },

diff --git a/kolibri/plugins/device/assets/src/views/DeprecationWarningBanner.vue b/kolibri/plugins/device/assets/src/views/DeprecationWarningBanner.vue
@@ -3,7 +3,7 @@
   <div
     v-show="showBanner"
     class="alert"
-    :style="{ backgroundColor: $themePalette.yellow.v_100 }"
+    :style="{ backgroundColor: $themePalette.yellow.v_200 }"
   >
     <div style="display:flex">
       <div>

diff --git a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
@@ -481,7 +481,7 @@
       ...mapGetters('deviceInfo', ['isRemoteContent']),
       InfoDescriptionColor() {
         return {
-          color: this.$themePalette.grey.v_700,
+          color: this.$themePalette.grey.v_600,
         };
       },
       pageTitle() {

diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/UnPinnedDevices.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/UnPinnedDevices.vue
@@ -111,7 +111,7 @@
         }
       },
       channelColor() {
-        return this.$themePalette.grey.v_700;
+        return this.$themePalette.grey.v_600;
       },
     },
     $trs: {