From 4648dc64adf9bfbf8f4bd6d1db0dff0d1714248e Mon Sep 17 00:00:00 2001 From: MisRob Date: Wed, 21 Feb 2024 09:38:31 +0100 Subject: [PATCH] Replace obsolete grey scales In the new theme, palette.grey.v_300/500/700/900 are not available anymore. This updates all places using removed scales by replacing them with closest darker grey scales that are available. --- .../assets/src/views/common/HeaderTabs/HeaderTab.vue | 2 +- .../src/views/common/status/ProgressSummaryBar.vue | 2 +- .../src/views/common/status/StatusTestPage.vue | 2 +- .../CreateExamPage/AssessmentQuestionListItem.vue | 2 +- .../plan/LessonContentPreviewPage/QuestionList.vue | 2 +- .../assets/src/views/AvailableChannelsPage/index.vue | 2 +- .../plugins/learn/assets/src/views/AlsoInThis.vue | 2 +- kolibri/plugins/learn/assets/src/views/CardList.vue | 12 ++++++------ .../views/CompletionModal/CompletionModalSection.vue | 2 +- .../CompletionModal/ResourceItem/ResourceLabel.vue | 4 ++-- .../learn/assets/src/views/CompletionModal/index.vue | 2 +- .../plugins/learn/assets/src/views/ProgressBar.vue | 2 +- kolibri/plugins/learn/assets/src/views/SearchBox.vue | 2 +- .../plugins/learn/assets/src/views/SearchChips.vue | 2 +- .../learn/assets/src/views/SidePanelModal/index.vue | 2 +- .../assets/src/views/TopicsPage/ToggleHeaderTabs.vue | 2 +- .../src/views/thumbnails/ContentNodeThumbnail.vue | 2 +- .../assets/src/views/thumbnails/QuizThumbnail.vue | 2 +- .../views/MediaPlayerTranscript/TranscriptCue.vue | 2 +- .../src/views/ChangeFacility/SelectFacility.vue | 2 +- .../assets/src/views/ProfilePage/index.vue | 2 +- .../components/AppError/TechnicalTextBlock.vue | 2 +- 22 files changed, 28 insertions(+), 28 deletions(-) diff --git a/kolibri/plugins/coach/assets/src/views/common/HeaderTabs/HeaderTab.vue b/kolibri/plugins/coach/assets/src/views/common/HeaderTabs/HeaderTab.vue index 49a2eb72162..845d7878060 100644 --- a/kolibri/plugins/coach/assets/src/views/common/HeaderTabs/HeaderTab.vue +++ b/kolibri/plugins/coach/assets/src/views/common/HeaderTabs/HeaderTab.vue @@ -39,7 +39,7 @@ return this.$computedClass({ ':focus': this.$coreOutline, ':hover': { - backgroundColor: this.$themePalette.grey.v_300, + backgroundColor: this.$themePalette.grey.v_400, }, }); }, diff --git a/kolibri/plugins/coach/assets/src/views/common/status/ProgressSummaryBar.vue b/kolibri/plugins/coach/assets/src/views/common/status/ProgressSummaryBar.vue index 1cedc7e0b9b..b23f92c48bc 100644 --- a/kolibri/plugins/coach/assets/src/views/common/status/ProgressSummaryBar.vue +++ b/kolibri/plugins/coach/assets/src/views/common/status/ProgressSummaryBar.vue @@ -2,7 +2,7 @@
diff --git a/kolibri/plugins/coach/assets/src/views/common/status/StatusTestPage.vue b/kolibri/plugins/coach/assets/src/views/common/status/StatusTestPage.vue index bd3cada1afa..12a6c4ac89a 100644 --- a/kolibri/plugins/coach/assets/src/views/common/status/StatusTestPage.vue +++ b/kolibri/plugins/coach/assets/src/views/common/status/StatusTestPage.vue @@ -214,7 +214,7 @@ return { border: `1px solid ${this.$themeTokens.fineLine}` }; }, thickBorderStyle() { - return { border: `2px solid ${this.$themePalette.grey.v_500}` }; + return { border: `2px solid ${this.$themePalette.grey.v_600}` }; }, }, mounted() { diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/AssessmentQuestionListItem.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/AssessmentQuestionListItem.vue index 1b641da6290..7243f6b780f 100644 --- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/AssessmentQuestionListItem.vue +++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/AssessmentQuestionListItem.vue @@ -109,7 +109,7 @@ return this.$computedClass({ ':focus': this.$coreOutline }); }, bgStyle() { - const color = this.isSelected ? this.$themePalette.grey.v_300 : this.$themeTokens.surface; + const color = this.isSelected ? this.$themePalette.grey.v_400 : this.$themeTokens.surface; return { backgroundColor: color }; }, }, diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/QuestionList.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/QuestionList.vue index c35601d10cb..130ccf5e532 100644 --- a/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/QuestionList.vue +++ b/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/QuestionList.vue @@ -52,7 +52,7 @@ methods: { buttonStyle(index) { return { - backgroundColor: index === this.selectedIndex ? this.$themePalette.grey.v_300 : '', + backgroundColor: index === this.selectedIndex ? this.$themePalette.grey.v_400 : '', }; }, }, diff --git a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue index aa933f05f30..fcd4d5386e2 100644 --- a/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue +++ b/kolibri/plugins/device/assets/src/views/AvailableChannelsPage/index.vue @@ -45,7 +45,7 @@

{{ $route.query.token }}

diff --git a/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue b/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue index 128ff1a7492..0b2ad868c14 100644 --- a/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue +++ b/kolibri/plugins/learn/assets/src/views/AlsoInThis.vue @@ -176,7 +176,7 @@ }, currentlyViewingTextStyle() { return { - color: this.$themePalette.grey.v_700, + color: this.$themePalette.grey.v_800, fontSize: '12px', margin: 'auto', }; diff --git a/kolibri/plugins/learn/assets/src/views/CardList.vue b/kolibri/plugins/learn/assets/src/views/CardList.vue index ba1dc55e03c..41a9926bf51 100644 --- a/kolibri/plugins/learn/assets/src/views/CardList.vue +++ b/kolibri/plugins/learn/assets/src/views/CardList.vue @@ -24,7 +24,7 @@ -
+

{{ categoryAndLevelString }}

{{ learnString('logo', { channelTitle: channelTitle }) }}

{{ bookmarkCreated }}

diff --git a/kolibri/plugins/learn/assets/src/views/CompletionModal/CompletionModalSection.vue b/kolibri/plugins/learn/assets/src/views/CompletionModal/CompletionModalSection.vue index 641d4bf5c10..948b4a9f69e 100644 --- a/kolibri/plugins/learn/assets/src/views/CompletionModal/CompletionModalSection.vue +++ b/kolibri/plugins/learn/assets/src/views/CompletionModal/CompletionModalSection.vue @@ -142,7 +142,7 @@ sectionStyle() { return { ':not(:last-child)': { - borderBottom: `1px solid ${this.$themePalette.grey.v_300}`, + borderBottom: `1px solid ${this.$themePalette.grey.v_400}`, }, }; }, diff --git a/kolibri/plugins/learn/assets/src/views/CompletionModal/ResourceItem/ResourceLabel.vue b/kolibri/plugins/learn/assets/src/views/CompletionModal/ResourceItem/ResourceLabel.vue index 8440f99c180..775d55d7538 100644 --- a/kolibri/plugins/learn/assets/src/views/CompletionModal/ResourceItem/ResourceLabel.vue +++ b/kolibri/plugins/learn/assets/src/views/CompletionModal/ResourceItem/ResourceLabel.vue @@ -16,7 +16,7 @@ v-else class="icon" icon="topic" - :color="$themePalette.grey.v_500" + :color="$themePalette.grey.v_600" /> @@ -33,7 +33,7 @@ v-if="contentNode.duration" class="duration" :seconds="contentNode.duration" - :style="{ color: $themePalette.grey.v_700 }" + :style="{ color: $themePalette.grey.v_800 }" /> diff --git a/kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue b/kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue index 8463e634caa..86eecc3a451 100644 --- a/kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue +++ b/kolibri/plugins/learn/assets/src/views/CompletionModal/index.vue @@ -297,7 +297,7 @@ sectionClass() { return this.$computedClass({ ':not(:last-child)': { - borderBottom: `1px solid ${this.$themePalette.grey.v_300}`, + borderBottom: `1px solid ${this.$themePalette.grey.v_400}`, }, }); }, diff --git a/kolibri/plugins/learn/assets/src/views/ProgressBar.vue b/kolibri/plugins/learn/assets/src/views/ProgressBar.vue index e6bc2602139..e30a808df99 100644 --- a/kolibri/plugins/learn/assets/src/views/ProgressBar.vue +++ b/kolibri/plugins/learn/assets/src/views/ProgressBar.vue @@ -8,7 +8,7 @@ :aria-valuemax="100" :aria-valuenow="progress * 100" > -

+

{{ coreString('completedLabel') }}

diff --git a/kolibri/plugins/learn/assets/src/views/SearchBox.vue b/kolibri/plugins/learn/assets/src/views/SearchBox.vue index a17b8f6a9bb..10e8d268808 100644 --- a/kolibri/plugins/learn/assets/src/views/SearchBox.vue +++ b/kolibri/plugins/learn/assets/src/views/SearchBox.vue @@ -9,7 +9,7 @@ class="search-box-row" :style="{ backgroundColor: $themeTokens.surface, - borderColor: $themePalette.grey.v_300, + borderColor: $themePalette.grey.v_400, fontSize: '16px', }" > diff --git a/kolibri/plugins/learn/assets/src/views/SearchChips.vue b/kolibri/plugins/learn/assets/src/views/SearchChips.vue index 30cb3f99b5d..609038ec43a 100644 --- a/kolibri/plugins/learn/assets/src/views/SearchChips.vue +++ b/kolibri/plugins/learn/assets/src/views/SearchChips.vue @@ -5,7 +5,7 @@ v-for="item in items" :key="item.key + item.value" class="filter-chip" - :style="{ backgroundColor: $themePalette.grey.v_300 }" + :style="{ backgroundColor: $themePalette.grey.v_400 }" >

{{ item.text }}

diff --git a/kolibri/plugins/learn/assets/src/views/SidePanelModal/index.vue b/kolibri/plugins/learn/assets/src/views/SidePanelModal/index.vue index aa982458085..1eac273fb02 100644 --- a/kolibri/plugins/learn/assets/src/views/SidePanelModal/index.vue +++ b/kolibri/plugins/learn/assets/src/views/SidePanelModal/index.vue @@ -145,7 +145,7 @@ position: 'fixed', top: 0, backgroundColor: this.$themeTokens.surface, - 'border-bottom': `1px solid ${this.$themePalette.grey.v_500}`, + 'border-bottom': `1px solid ${this.$themePalette.grey.v_600}`, padding: '24px 32px', // Header border stays over content with this, but under any tooltips 'z-index': 16, diff --git a/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue b/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue index 226f5dccb00..ba843e1afad 100644 --- a/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue +++ b/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue @@ -86,7 +86,7 @@ return this.$computedClass({ ':focus': this.$coreOutline, ':hover': { - backgroundColor: this.$themePalette.grey.v_300, + backgroundColor: this.$themePalette.grey.v_400, }, }); }, diff --git a/kolibri/plugins/learn/assets/src/views/thumbnails/ContentNodeThumbnail.vue b/kolibri/plugins/learn/assets/src/views/thumbnails/ContentNodeThumbnail.vue index c5163295e31..e6301b3f55e 100644 --- a/kolibri/plugins/learn/assets/src/views/thumbnails/ContentNodeThumbnail.vue +++ b/kolibri/plugins/learn/assets/src/views/thumbnails/ContentNodeThumbnail.vue @@ -12,7 +12,7 @@ diff --git a/kolibri/plugins/learn/assets/src/views/thumbnails/QuizThumbnail.vue b/kolibri/plugins/learn/assets/src/views/thumbnails/QuizThumbnail.vue index 434fc7a737c..877809f08bd 100644 --- a/kolibri/plugins/learn/assets/src/views/thumbnails/QuizThumbnail.vue +++ b/kolibri/plugins/learn/assets/src/views/thumbnails/QuizThumbnail.vue @@ -4,7 +4,7 @@ diff --git a/kolibri/plugins/media_player/assets/src/views/MediaPlayerTranscript/TranscriptCue.vue b/kolibri/plugins/media_player/assets/src/views/MediaPlayerTranscript/TranscriptCue.vue index ef7cf55f066..7f1f36c1c0b 100755 --- a/kolibri/plugins/media_player/assets/src/views/MediaPlayerTranscript/TranscriptCue.vue +++ b/kolibri/plugins/media_player/assets/src/views/MediaPlayerTranscript/TranscriptCue.vue @@ -71,7 +71,7 @@ style() { const activeStyles = this.active ? { - backgroundColor: this.$themePalette.grey.v_300, + backgroundColor: this.$themePalette.grey.v_400, borderLeftColor: this.$themeTokens.video, } : {}; diff --git a/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/SelectFacility.vue b/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/SelectFacility.vue index 658616f774d..a1e40b9edc2 100644 --- a/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/SelectFacility.vue +++ b/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/SelectFacility.vue @@ -33,7 +33,7 @@ :style="{ marginTop: '34px', paddingTop: '10px', - borderTop: `1px solid ${$themePalette.grey.v_300}` + borderTop: `1px solid ${$themePalette.grey.v_400}` }" > diff --git a/kolibri/plugins/user_profile/assets/src/views/ProfilePage/index.vue b/kolibri/plugins/user_profile/assets/src/views/ProfilePage/index.vue index 23b9e7f167d..544a6062b89 100644 --- a/kolibri/plugins/user_profile/assets/src/views/ProfilePage/index.vue +++ b/kolibri/plugins/user_profile/assets/src/views/ProfilePage/index.vue @@ -124,7 +124,7 @@ v-if="onMyOwnSetup" :style="{ marginTop: '34px', paddingTop: '10px', - borderTop: `1px solid ${$themePalette.grey.v_300}` }" + borderTop: `1px solid ${$themePalette.grey.v_400}` }" >