CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove buggy condition for sidebar overlay (#505)

Browse Source 
* fix: remove buggy condition for sidebar overlay
* fix: add missing styling in iconsOnly Mode

Signed-off-by: steadyjaw <martin.keilaus@gmail.com>
This commit is contained in:
steadyjaw 2022-01-03 12:06:55 +01:00 committed by GitHub
parent a339cabc7d
commit b2335b16f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/TheSidebar.vue
View File

@ -42,23 +42,25 @@
} }
</style> </style>
<template> <template>
<v-navigation-drawer v-model="naviDrawer" :src="sidebarBackground" :mini-variant="(navigationStyle === 'iconsOnly')" :key="navigationStyle" :width="navigationWidth" :temporary="boolNaviTemp" :hide-overlay="!isMobile" clipped app :style="cssVars"> <v-navigation-drawer v-model="naviDrawer" :src="sidebarBackground" :mini-variant="(navigationStyle === 'iconsOnly')" :key="navigationStyle" :width="navigationWidth" :temporary="boolNaviTemp" clipped app :style="sidebarCssVars">
<overlay-scrollbars class="nav-scrollbar"> <overlay-scrollbars class="nav-scrollbar">
<v-list class="pr-0 pt-0 ml-0"> <v-list class="pr-0 pt-0 ml-0">
<v-list-item-group active-class="active-nav-item"> <v-list-item-group active-class="active-nav-item">
<v-list-item <v-list-item
router to="/" router to="/"
class="d-flex d-sm-none sidebar-logo no-text-decoration no-background no-border" :class="'d-flex d-sm-none sidebar-logo no-text-decoration no-background no-border ' + ((navigationStyle === 'iconsOnly') ? 'pa-0 justify-center' : '')"
:style="'height: ' + topbarHeight + 'px'" :style="'height: ' + topbarHeight + 'px'"
:ripple="false" :ripple="false"
> >
<template v-if="sidebarLogo"> <template v-if="sidebarLogo">
<img :src="sidebarLogo" style="height: 32px;" class="nav-logo mr-3" alt="Logo" /> <img :src="sidebarLogo" :style="logoCssVars" class="nav-logo" alt="Logo" />
</template> </template>
<template v-else> <template v-else>
<mainsail-logo :color="logoColor" style="height: 32px;" class="nav-logo mr-4" :ripple="false"></mainsail-logo> <mainsail-logo :color="logoColor" :style="logoCssVars" class="nav-logo" :ripple="false"></mainsail-logo>
</template> </template>
<template v-if="navigationStyle !== 'iconsOnly'">
<span class="text-h6 font-weight-regular text-truncate"> {{ printerName }} </span> <span class="text-h6 font-weight-regular text-truncate"> {{ printerName }} </span>
</template>
</v-list-item> </v-list-item>
<template v-if="countPrinters"> <template v-if="countPrinters">
<v-tooltip right :open-delay="500" :disabled="navigationStyle !== 'iconsOnly'"> <v-tooltip right :open-delay="500" :disabled="navigationStyle !== 'iconsOnly'">
@ -195,7 +197,7 @@ export default class TheSidebar extends Mixins(BaseMixin) {
return false return false
} }
get cssVars(): any { get sidebarCssVars(): any {
if(this.boolNaviTemp){ if(this.boolNaviTemp){
return { return {
'top': `${topbarHeight}px !important`, 'top': `${topbarHeight}px !important`,
@ -220,6 +222,14 @@ export default class TheSidebar extends Mixins(BaseMixin) {
return this.$store.state.printer.hostname return this.$store.state.printer.hostname
} }
get logoCssVars() {
if(this.navigationStyle !== 'iconsOnly'){
return {
'margin-right': '16px'
}
}
return {}
}
showInNavi(route: AppRoute): boolean { showInNavi(route: AppRoute): boolean {
if (['shutdown', 'error', 'disconnected'].includes(this.klippy_state) && !route.alwaysShow) return false if (['shutdown', 'error', 'disconnected'].includes(this.klippy_state) && !route.alwaysShow) return false