Commit 3543b437 authored by nwindis's avatar nwindis
Browse files

Merge branch 'bugfix/fix-color-scheme-activation' into 'develop'

fix color scheme activation

See merge request subugoe/emo/Qviewer!87
parents d2e68875 acdd79d4
Pipeline #155088 passed with stages
in 3 minutes and 33 seconds
......@@ -315,9 +315,9 @@ It's a *JSON* object. So if you are going to make any changes and you have to qu
`primary` and `accent` should be a darker tone, so that white text is visible if used as background. It's the other way around with `secondary`.
Hex values (like `#a1a1a1`) or color names (like `hotpink`) can be used.
Hex values (like `#a1a1a1`) or color names (like `hotpink`) are fine.
If any value is left `false`, a default color scheme will be used.
If any value is left blank (e.g. `"primary": "",`), a default color scheme will be used.
## Configure the panels
......
......@@ -307,7 +307,7 @@ export default {
this.$q.dark.set('auto');
this.itemurls.sort((a, b) => a.localeCompare(b, undefined, { numeric: true }));
if (this.config.colors.primary !== 'false') {
if (this.config.colors.primary && this.config.colors.secondary && this.config.colors.accent) {
colors.setBrand('primary', this.config.colors.primary);
colors.setBrand('secondary', this.config.colors.secondary);
colors.setBrand('accent', this.config.colors.accent);
......
......@@ -25,7 +25,7 @@
clickable
@click="() => changeColorsTo('emo')"
v-close-popup
v-if="projectcolors.primary"
v-if="projectcolors.primary && projectcolors.secondary && projectcolors.accent"
>
<q-item-section>EMo</q-item-section>
</q-item>
......@@ -57,7 +57,7 @@ export default {
methods: {
changeColorsTo(color) {
if (color === 'default') {
if (this.projectcolors.primary) {
if (this.projectcolors.primary && this.projectcolors.secondary && this.projectcolors.accent) {
colors.setBrand('primary', this.projectcolors.primary);
colors.setBrand('secondary', this.projectcolors.secondary);
colors.setBrand('accent', this.projectcolors.accent);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment