maps V_1100 themetoken to V_600

learningequality · Oct 25, 2024 · a1de0c8 · a1de0c8
1 parent 40165ca
commit a1de0c8
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 20 deletions.
diff --git a/kolibri/core/assets/src/views/AttemptLogItem.vue b/kolibri/core/assets/src/views/AttemptLogItem.vue
@@ -59,7 +59,7 @@
       v-if="attemptLog.missing_resource"
       class="coach-content-label"
       icon="warning"
-      :color="$themePalette.yellow.v_500"
+      :color="$themePalette.yellow.v_600"
     />
   </span>
 

diff --git a/kolibri/core/assets/src/views/ImmersiveToolbar.vue b/kolibri/core/assets/src/views/ImmersiveToolbar.vue
@@ -115,7 +115,7 @@
       },
       linkStyle() {
         const hoverBg = this.isFullscreen
-          ? this.$themeBrand.secondary.v_500
+          ? this.$themeBrand.secondary.v_600
           : this.$themePalette.grey.v_600;
         const defaultBg = this.isFullscreen ? this.$themeTokens.appBar : this.$themePalette.black;
         return {

diff --git a/kolibri/core/assets/src/views/Navbar/NavbarLink.vue b/kolibri/core/assets/src/views/Navbar/NavbarLink.vue
@@ -63,7 +63,7 @@
         return {
           color: this.$themeTokens.text,
           ':hover': {
-            'background-color': this.$themeBrand.secondary.v_500,
+            'background-color': this.$themeBrand.secondary.v_600,
           },
           ':focus': {
             ...this.$coreOutline,

diff --git a/kolibri/core/package.json b/kolibri/core/package.json
@@ -21,7 +21,7 @@
     "js-cookie": "^3.0.5",
     "knuth-shuffle-seeded": "^1.0.6",
     "kolibri-constants": "0.2.6",
-    "kolibri-design-system": "4.4.0",
+    "kolibri-design-system": "4.4.6",
     "lockr": "0.8.5",
     "lodash": "^4.17.21",
     "loglevel": "^1.9.1",

diff --git a/kolibri/plugins/coach/assets/src/views/common/QuizStatus.vue b/kolibri/plugins/coach/assets/src/views/common/QuizStatus.vue
@@ -341,10 +341,10 @@
       cancelStyleOverrides() {
         return {
           color: this.$themeTokens.textInverted,
-          'background-color': this.$themePalette.red.v_500,
+          'background-color': this.$themePalette.red.v_600,
           // We need to use a darker color for hover than
-          // palette.red.v_500 but at the same time,
-          // palette.red.v_500 is the darkest available red
+          // palette.red.v_600 but at the same time,
+          // palette.red.v_600 is the darkest available red
           // in the palette. Using this hardcoded color was
           // agreed with designers.
           ':hover': { 'background-color': '#A81700' },

diff --git a/kolibri/plugins/coach/assets/src/views/common/notifications/NotificationCard.vue b/kolibri/plugins/coach/assets/src/views/common/notifications/NotificationCard.vue
@@ -24,7 +24,7 @@
             <KIcon
               ref="warning"
               icon="warning"
-              :color="$themePalette.yellow.v_500"
+              :color="$themePalette.yellow.v_600"
             />
             <KTooltip
               reference="warning"

diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/QuestionListPreview.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/QuestionListPreview.vue
@@ -140,7 +140,7 @@
       <p v-else>
         <KIcon
           icon="warning"
-          :style="{ fill: $themePalette.yellow.v_500 }"
+          :style="{ fill: $themePalette.yellow.v_600 }"
         />
         {{ resourceMissingText }}
       </p>

diff --git a/...lugins/coach/assets/src/views/plan/LessonEditDetailsPage/EditDetailsResourceListTable.vue b/...lugins/coach/assets/src/views/plan/LessonEditDetailsPage/EditDetailsResourceListTable.vue
@@ -73,7 +73,7 @@
                 <p>
                   <KIcon
                     icon="warning"
-                    :style="{ fill: $themePalette.yellow.v_500 }"
+                    :style="{ fill: $themePalette.yellow.v_600 }"
                   />
                   {{ resourceMissingText }}
                 </p>

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/ResourceListTable.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/ResourceListTable.vue
@@ -80,7 +80,7 @@
                     !getCachedResource(resource.contentnode_id).available
                 "
                 icon="warning"
-                :style="{ fill: $themePalette.yellow.v_500 }"
+                :style="{ fill: $themePalette.yellow.v_600 }"
               />
             </div>
 

diff --git a/kolibri/plugins/device/assets/src/views/DeprecationWarningBanner.vue b/kolibri/plugins/device/assets/src/views/DeprecationWarningBanner.vue
@@ -10,7 +10,7 @@
         <KIcon
           icon="warning"
           class="icon"
-          :color="$themePalette.yellow.v_500"
+          :color="$themePalette.yellow.v_600"
         />
       </div>
 

diff --git a/kolibri/plugins/facility/assets/src/views/ImportCsvPage/Preview.vue b/kolibri/plugins/facility/assets/src/views/ImportCsvPage/Preview.vue
@@ -62,7 +62,7 @@
             </td>
             <td
               class="numeric"
-              :style="{ color: $themePalette.green.v_500 }"
+              :style="{ color: $themePalette.green.v_600 }"
             >
               {{ users_report.created }}
             </td>
@@ -87,7 +87,7 @@
             </td>
             <td
               class="numeric"
-              :style="{ color: $themePalette.green.v_500 }"
+              :style="{ color: $themePalette.green.v_600 }"
             >
               {{ classes_report.created }}
             </td>

diff --git a/kolibri/plugins/learn/assets/src/views/ExamPage/AnswerHistory.vue b/kolibri/plugins/learn/assets/src/views/ExamPage/AnswerHistory.vue
@@ -79,7 +79,7 @@
                     v-if="question.missing"
                     class="dot"
                     icon="warning"
-                    :color="$themePalette.yellow.v_500"
+                    :color="$themePalette.yellow.v_600"
                   />
                   <KIcon
                     v-else

diff --git a/kolibri/plugins/learn/assets/src/views/ExamPage/index.vue b/kolibri/plugins/learn/assets/src/views/ExamPage/index.vue
@@ -135,7 +135,7 @@
                     v-if="currentQuestionOption.disabled"
                     class="dot"
                     icon="warning"
-                    :color="$themePalette.yellow.v_500"
+                    :color="$themePalette.yellow.v_600"
                   />
                   <KIcon
                     v-else
@@ -160,7 +160,7 @@
                     v-if="option.disabled"
                     class="dot"
                     icon="warning"
-                    :color="$themePalette.yellow.v_500"
+                    :color="$themePalette.yellow.v_600"
                   />
                   <KIcon
                     v-else

diff --git a/yarn.lock b/yarn.lock
@@ -7736,6 +7736,26 @@ [email protected]:
     vue2-teleport "1.1.4"
     xstate "4.38.3"
 
+[email protected]:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/kolibri-design-system/-/kolibri-design-system-4.6.0.tgz#9142be6798e5f8c5df9c5f7884f1398f4c9441d3"
+  integrity sha512-mZybyRcMXNtYN9iRTvhIcgtrzs8/i+ttfsH3NM7LJCXtbvB9rS5toIYGZ/vnffqxhAytQIlOmd3+v1T9K9gjFg==
+  dependencies:
+    "@vue/composition-api" "1.7.2"
+    aphrodite "https://github.com/learningequality/aphrodite/"
+    autosize "3.0.21"
+    css-element-queries "1.2.0"
+    date-fns "1.30.1"
+    frame-throttle "3.0.0"
+    fuzzysearch "1.0.3"
+    lodash "4.17.21"
+    popper.js "1.16.1"
+    purecss "2.2.0"
+    tippy.js "4.2.1"
+    vue-intl "3.1.0"
+    vue2-teleport "1.1.4"
+    xstate "4.38.3"
+
 launch-editor-middleware@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.8.0.tgz#e6021d2ceb70830fddf8bbcee5730acb5aa2db58"
@@ -10597,7 +10617,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10656,7 +10685,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", [email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+[email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11968,7 +12004,16 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==