From a1de0c83303b6a3cbe852cf43c6cf08d8539c516 Mon Sep 17 00:00:00 2001 From: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com> Date: Fri, 25 Oct 2024 18:46:42 +0300 Subject: [PATCH] maps V_1100 themetoken to V_600 --- .../core/assets/src/views/AttemptLogItem.vue | 2 +- .../assets/src/views/ImmersiveToolbar.vue | 2 +- .../assets/src/views/Navbar/NavbarLink.vue | 2 +- kolibri/core/package.json | 2 +- .../assets/src/views/common/QuizStatus.vue | 6 +-- .../common/notifications/NotificationCard.vue | 2 +- .../CreateExamPage/QuestionListPreview.vue | 2 +- .../EditDetailsResourceListTable.vue | 2 +- .../LessonSummaryPage/ResourceListTable.vue | 2 +- .../src/views/DeprecationWarningBanner.vue | 2 +- .../src/views/ImportCsvPage/Preview.vue | 4 +- .../src/views/ExamPage/AnswerHistory.vue | 2 +- .../learn/assets/src/views/ExamPage/index.vue | 4 +- yarn.lock | 51 +++++++++++++++++-- 14 files changed, 65 insertions(+), 20 deletions(-) diff --git a/kolibri/core/assets/src/views/AttemptLogItem.vue b/kolibri/core/assets/src/views/AttemptLogItem.vue index e9d64e1524d..ddfe1e6b349 100644 --- 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" /> diff --git a/kolibri/core/assets/src/views/ImmersiveToolbar.vue b/kolibri/core/assets/src/views/ImmersiveToolbar.vue index 99b47c3dab8..5a2a7006f4e 100644 --- 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 index cd762496485..a0d720ea7f8 100644 --- 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 index 332c2e4b656..9dd80c1daf4 100644 --- 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 index 2404eb1be4d..4f45592e0f4 100644 --- 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 index df95bf97cd3..1a2a431b745 100644 --- 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 @@ {{ resourceMissingText }}

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonEditDetailsPage/EditDetailsResourceListTable.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonEditDetailsPage/EditDetailsResourceListTable.vue index 5e027220457..4501e337917 100644 --- a/kolibri/plugins/coach/assets/src/views/plan/LessonEditDetailsPage/EditDetailsResourceListTable.vue +++ b/kolibri/plugins/coach/assets/src/views/plan/LessonEditDetailsPage/EditDetailsResourceListTable.vue @@ -73,7 +73,7 @@

{{ resourceMissingText }}

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/ResourceListTable.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/ResourceListTable.vue index fe16412f25b..a4a324dc21c 100644 --- 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 }" /> diff --git a/kolibri/plugins/device/assets/src/views/DeprecationWarningBanner.vue b/kolibri/plugins/device/assets/src/views/DeprecationWarningBanner.vue index 406bfa3a706..722648b75da 100644 --- a/kolibri/plugins/device/assets/src/views/DeprecationWarningBanner.vue +++ b/kolibri/plugins/device/assets/src/views/DeprecationWarningBanner.vue @@ -10,7 +10,7 @@ diff --git a/kolibri/plugins/facility/assets/src/views/ImportCsvPage/Preview.vue b/kolibri/plugins/facility/assets/src/views/ImportCsvPage/Preview.vue index 37ae84c7284..ea4c2774a3f 100644 --- a/kolibri/plugins/facility/assets/src/views/ImportCsvPage/Preview.vue +++ b/kolibri/plugins/facility/assets/src/views/ImportCsvPage/Preview.vue @@ -62,7 +62,7 @@ {{ users_report.created }} @@ -87,7 +87,7 @@ {{ classes_report.created }} diff --git a/kolibri/plugins/learn/assets/src/views/ExamPage/AnswerHistory.vue b/kolibri/plugins/learn/assets/src/views/ExamPage/AnswerHistory.vue index 79098ad303b..a25d64c42e1 100644 --- 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" />