Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some missed updates in theming #12154

Merged
merged 2 commits into from
May 13, 2024
Merged

Fix some missed updates in theming #12154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
268e3b8
Update brand color validation to match new schema.
rtibbles May 9, 2024
e239cbe
Update color tokens to ones that match the new scheme.
rtibbles May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions kolibri/core/assets/src/styles/themeSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,12 @@ import isObject from 'lodash/isObject';

const logging = logger.getLogger(__filename);

function _colorScaleValidator(value) {
function _brandColorScaleValidator(value) {
if (!isObject(value)) {
logging.error(`Expected object but got '${value}'`);
return false;
}
const COLOR_NAMES = [
'v_50',
'v_100',
'v_200',
'v_300',
'v_400',
'v_500',
'v_600',
'v_700',
'v_800',
'v_900',
];
const COLOR_NAMES = ['v_200', 'v_400', 'v_600', 'v_800', 'v_1000', 'v_1100'];
for (const colorName of COLOR_NAMES) {
if (!value[colorName]) {
logging.error(`${colorName} '${name}' not defined by theme`);
Expand Down Expand Up @@ -60,12 +49,12 @@ export default {
primary: {
type: Object,
required: true,
validator: _colorScaleValidator,
validator: _brandColorScaleValidator,
},
secondary: {
type: Object,
required: true,
validator: _colorScaleValidator,
validator: _brandColorScaleValidator,
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/device/assets/src/views/DeprecationWarningBanner.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div
v-show="showBanner"
class="alert"
:style="{ backgroundColor: $themePalette.yellow.v_100 }"
:style="{ backgroundColor: $themePalette.yellow.v_200 }"
>
<div style="display:flex">
<div>
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@
...mapGetters('deviceInfo', ['isRemoteContent']),
InfoDescriptionColor() {
return {
color: this.$themePalette.grey.v_700,
color: this.$themePalette.grey.v_600,
};
},
pageTitle() {
Expand Down
2 changes: 1 addition & 1 deletion kolibri/plugins/learn/assets/src/views/LibraryPage/UnPinnedDevices.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
}
},
channelColor() {
return this.$themePalette.grey.v_700;
return this.$themePalette.grey.v_600;
},
},
$trs: {
Expand Down
Loading