Skip to content

Commit

Permalink
Replace obsolete grey scales
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
MisRob committed Feb 21, 2024
1 parent 0098f7e commit 585ecce
Show file tree
Hide file tree
Showing 20 changed files with 26 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
return this.$computedClass({
':focus': this.$coreOutline,
':hover': {
backgroundColor: this.$themePalette.grey.v_300,
backgroundColor: this.$themePalette.grey.v_400,
},
});
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 : '',
};
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<div
v-if="$route.query.token"
class="token-chip"
:style="{ backgroundColor: $themePalette.grey.v_300 }"
:style="{ backgroundColor: $themePalette.grey.v_400 }"
>
<span>
<p class="token-chip-text">{{ $route.query.token }}</p>
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/AlsoInThis.vue
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
},
currentlyViewingTextStyle() {
return {
color: this.$themePalette.grey.v_700,
color: this.$themePalette.grey.v_800,
fontSize: '12px',
margin: 'auto',
};
Expand Down
12 changes: 6 additions & 6 deletions kolibri/plugins/learn/assets/src/views/CardList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<KFixedGridItem :span="isMobile ? 4 : 3" class="text-area">
<span :style="{ color: $themeTokens.text }">
<div class="metadata-info" :style="{ color: $themePalette.grey.v_700 }">
<div class="metadata-info" :style="{ color: $themePalette.grey.v_800 }">
<LearningActivityLabel
:contentNode="contentNode"
:hideDuration="true"
Expand All @@ -47,25 +47,25 @@
:contentNode="contentNode"
:class="categoryAndLevelString ? 'duration prepends' : 'duration'"
condensed
:style="{ color: $themePalette.grey.v_700, marginTop: 0 }"
:style="{ color: $themePalette.grey.v_800, marginTop: 0 }"
/>
<p
v-if="categoryAndLevelString"
class="metadata-info"
:style="{ color: $themePalette.grey.v_700, marginTop: 0 }"
:style="{ color: $themePalette.grey.v_800, marginTop: 0 }"
>{{ categoryAndLevelString }}</p>
<div>
<img
v-if="channelThumbnail"
:src="channelThumbnail"
:alt="learnString('logo', { channelTitle: channelTitle })"
class="channel-logo"
:style="{ color: $themePalette.grey.v_700 }"
:style="{ color: $themePalette.grey.v_800 }"
>
<p
v-else
class="metadata-info"
:style="{ color: $themePalette.grey.v_700, marginTop: 0 }"
:style="{ color: $themePalette.grey.v_800, marginTop: 0 }"
>{{ learnString('logo', { channelTitle: channelTitle }) }}</p>
<KButton
v-if="contentNode.copies"
Expand All @@ -81,7 +81,7 @@
<p
v-if="createdDate"
class="created-info"
:style="{ color: $themePalette.grey.v_700 }"
:style="{ color: $themePalette.grey.v_800 }"
>
{{ bookmarkCreated }}
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}`,
},
};
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
v-else
class="icon"
icon="topic"
:color="$themePalette.grey.v_500"
:color="$themePalette.grey.v_600"
/>
</template>

Expand All @@ -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 }"
/>
</span>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}`,
},
});
},
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/ProgressBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:aria-valuemax="100"
:aria-valuenow="progress * 100"
>
<p v-if="completed" class="completion-label" :style="{ color: $themePalette.grey.v_700 }">
<p v-if="completed" class="completion-label" :style="{ color: $themePalette.grey.v_800 }">
<ProgressIcon :progress="progress" class="completion-icon" />
{{ coreString('completedLabel') }}
</p>
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/SearchBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class="search-box-row"
:style="{
backgroundColor: $themeTokens.surface,
borderColor: $themePalette.grey.v_300,
borderColor: $themePalette.grey.v_400,
fontSize: '16px',
}"
>
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/SearchChips.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 }"
>
<span>
<p class="filter-chip-text">{{ item.text }}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
return this.$computedClass({
':focus': this.$coreOutline,
':hover': {
backgroundColor: this.$themePalette.grey.v_300,
backgroundColor: this.$themePalette.grey.v_400,
},
});
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<KIcon
v-else
icon="topic"
:color="$themePalette.grey.v_500"
:color="$themePalette.grey.v_600"
/>
</template>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<template #icon>
<KIcon
icon="exercise"
:color="$themePalette.grey.v_500"
:color="$themePalette.grey.v_600"
/>
</template>
</Thumbnail>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
: {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
:style="{
marginTop: '34px',
paddingTop: '10px',
borderTop: `1px solid ${$themePalette.grey.v_300}`
borderTop: `1px solid ${$themePalette.grey.v_400}`
}"
>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}` }"
>
<KGridItem
:layout8="{ span: 4 }"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
aria-hidden="true"
:style="[dynamicHeightStyle, {
backgroundColor: $themePalette.grey.v_200,
border: $themePalette.grey.v_300,
border: $themePalette.grey.v_400,
}]"
>
</textarea>
Expand Down

0 comments on commit 585ecce

Please sign in to comment.