Skip to content

Commit

Permalink
upgrades kds themetokens
Browse files Browse the repository at this point in the history
  • Loading branch information
AllanOXDi committed Oct 24, 2024
1 parent 85dee75 commit ffb0a76
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/styles/themeSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function _brandColorScaleValidator(value) {
logging.error(`Expected object but got '${value}'`);
return false;
}
const COLOR_NAMES = ['v_200', 'v_400', 'v_600', 'v_800', 'v_1000', 'v_1100'];
const COLOR_NAMES = ['v_200', 'v_400', 'v_500', 'v_600', 'v_800', ];
for (const colorName of COLOR_NAMES) {
if (!value[colorName]) {
logging.error(`${colorName} '${name}' not defined by theme`);
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/AttemptLogItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
v-if="attemptLog.missing_resource"
class="coach-content-label"
icon="warning"
:color="$themePalette.yellow.v_1100"
:color="$themePalette.yellow.v_500"
/>
</span>

Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/ImmersiveToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
},
linkStyle() {
const hoverBg = this.isFullscreen
? this.$themeBrand.secondary.v_1100
? this.$themeBrand.secondary.v_500
: this.$themePalette.grey.v_600;
const defaultBg = this.isFullscreen ? this.$themeTokens.appBar : this.$themePalette.black;
return {
Expand Down
2 changes: 1 addition & 1 deletion kolibri/core/assets/src/views/Navbar/NavbarLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
return {
color: this.$themeTokens.text,
':hover': {
'background-color': this.$themeBrand.secondary.v_1100,
'background-color': this.$themeBrand.secondary.v_500,
},
':focus': {
...this.$coreOutline,
Expand Down
6 changes: 3 additions & 3 deletions kolibri/plugins/coach/assets/src/views/common/QuizStatus.vue
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,10 @@
cancelStyleOverrides() {
return {
color: this.$themeTokens.textInverted,
'background-color': this.$themePalette.red.v_1100,
'background-color': this.$themePalette.red.v_500,
// We need to use a darker color for hover than
// palette.red.v_1100 but at the same time,
// palette.red.v_1100 is the darkest available red
// palette.red.v_500 but at the same time,
// palette.red.v_500 is the darkest available red
// in the palette. Using this hardcoded color was
// agreed with designers.
':hover': { 'background-color': '#A81700' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<KIcon
ref="warning"
icon="warning"
:color="$themePalette.yellow.v_1100"
:color="$themePalette.yellow.v_500"
/>
<KTooltip
reference="warning"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
<p v-else>
<KIcon
icon="warning"
:style="{ fill: $themePalette.yellow.v_1100 }"
:style="{ fill: $themePalette.yellow.v_500 }"
/>
{{ resourceMissingText }}
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<p>
<KIcon
icon="warning"
:style="{ fill: $themePalette.yellow.v_1100 }"
:style="{ fill: $themePalette.yellow.v_500 }"
/>
{{ resourceMissingText }}
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
!getCachedResource(resource.contentnode_id).available
"
icon="warning"
:style="{ fill: $themePalette.yellow.v_1100 }"
:style="{ fill: $themePalette.yellow.v_500 }"
/>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<KIcon
icon="warning"
class="icon"
:color="$themePalette.yellow.v_1100"
:color="$themePalette.yellow.v_500"
/>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</td>
<td
class="numeric"
:style="{ color: $themePalette.green.v_1100 }"
:style="{ color: $themePalette.green.v_500 }"
>
{{ users_report.created }}
</td>
Expand All @@ -87,7 +87,7 @@
</td>
<td
class="numeric"
:style="{ color: $themePalette.green.v_1100 }"
:style="{ color: $themePalette.green.v_500 }"
>
{{ classes_report.created }}
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
v-if="question.missing"
class="dot"
icon="warning"
:color="$themePalette.yellow.v_1100"
:color="$themePalette.yellow.v_500"
/>
<KIcon
v-else
Expand Down
4 changes: 2 additions & 2 deletions kolibri/plugins/learn/assets/src/views/ExamPage/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
v-if="currentQuestionOption.disabled"
class="dot"
icon="warning"
:color="$themePalette.yellow.v_1100"
:color="$themePalette.yellow.v_500"
/>
<KIcon
v-else
Expand All @@ -160,7 +160,7 @@
v-if="option.disabled"
class="dot"
icon="warning"
:color="$themePalette.yellow.v_1100"
:color="$themePalette.yellow.v_500"
/>
<KIcon
v-else
Expand Down

0 comments on commit ffb0a76

Please sign in to comment.