jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed toolbar colors for vuetify 2

Browse Source
This commit is contained in:
Stefan Zermatten
2021-03-28 14:29:56 +02:00
parent 60ae1ef604
commit 838e2ed35f
9 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/imports/ui/components/ToolbarCard.vue
View File

@@ -25,12 +25,14 @@
<script lang="js">
import isDarkColor from '/imports/ui/utility/isDarkColor.js';
import getThemeColor from '/imports/ui/utility/getThemeColor.js';
export default {
props: {
color: {
type: String,
default(){
return this.$vuetify.theme.themes.light.secondary;
return getThemeColor('secondary');
},
},
},

3
app/imports/ui/components/propertyToolbar.vue
View File

@@ -123,6 +123,7 @@ import isDarkColor from '/imports/ui/utility/isDarkColor.js';
import PropertyIcon from '/imports/ui/properties/shared/PropertyIcon.vue';
import { getPropertyName } from '/imports/constants/PROPERTIES.js';
import ColorPicker from '/imports/ui/components/ColorPicker.vue';
import getThemeColor from '/imports/ui/utility/getThemeColor.js';
export default {
components: {
@@ -142,7 +143,7 @@ export default {
return isDarkColor(this.color);
},
color(){
return this.model && this.model.color || this.$vuetify.theme.themes.light.secondary;
return this.model && this.model.color || getThemeColor('secondary');
},
title(){
let model = this.model;