Skip to content

Commit

Permalink
feat(Theme): match primary color with OFF colors (#1268)
Browse files Browse the repository at this point in the history
  • Loading branch information
raphodn authored Jan 15, 2025
1 parent 04626fa commit b4f3974
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
7 changes: 3 additions & 4 deletions src/components/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<v-btn v-else prepend-icon="mdi-magnify" to="/search" :aria-label="$t('Common.Search')">
{{ $t('Common.Search') }}
</v-btn>
<v-btn v-if="!$vuetify.display.smAndUp" color="primary" icon="mdi-tag-plus-outline" to="/prices/add/multiple" :aria-label="$t('Common.AddPrices')" />
<v-btn v-else color="primary" prepend-icon="mdi-tag-plus-outline" to="/prices/add/multiple" :aria-label="$t('Common.AddPrices')">
<v-btn v-if="!$vuetify.display.smAndUp" icon="mdi-tag-plus-outline" to="/prices/add/multiple" :aria-label="$t('Common.AddPrices')" />
<v-btn v-else prepend-icon="mdi-tag-plus-outline" to="/prices/add/multiple" :aria-label="$t('Common.AddPrices')">
{{ $t('Common.AddPrices') }}
</v-btn>
<template v-if="!username" #append>
Expand All @@ -38,7 +38,6 @@
:slim="true"
:title="item.title"
:prepend-icon="item.props['prepend-icon']"
:base-color="item.props['base-color']"
:to="item.props.to"
/>
</v-list>
Expand Down Expand Up @@ -74,7 +73,7 @@ export default {
.filter(r => r.meta && r.meta.drawerMenu)
.filter(r => this.username ? r.meta.requiresAuth !== false : !r.meta.requiresAuth)
.filter(r => !r.meta.drawerMenuConditionalDisplay || this.appStore.user[r.meta.drawerMenuConditionalDisplay])
.map((r => ({ title: this.$t(`Router.${r.meta.title}.Title`), props: { 'prepend-icon': r.meta.icon, 'base-color': r.meta.color, to: r.path }})))
.map((r => ({ title: this.$t(`Router.${r.meta.title}.Title`), props: { 'prepend-icon': r.meta.icon, to: r.path }})))
}
},
methods: {
Expand Down
13 changes: 11 additions & 2 deletions src/plugins/vuetify.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,27 @@ export const vuetify = createVuetify({
mdi,
},
},
// https://vuetifyjs.com/en/features/theme
theme: {
themes: {
light: {
colors: {
header: "rgb(242, 233, 228)",
primary: '#341100',
header: '#f2e9e4',
footer: '#bdbdbd'
},
variables: {
'border-color': '#201A17'
}
},
dark: {
colors: {
header: "#0d161b",
primary: '#A08D84',
header: '#201A17',
footer: '#424242'
},
variables: {
'border-color': '#85746C'
}
},
},
Expand Down
4 changes: 2 additions & 2 deletions src/router.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b4f3974

Please sign in to comment.