diff --git a/src/App.vue b/src/App.vue index 24aacef7b..29a4a2b71 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,37 +1,11 @@ - - @@ -105,13 +79,27 @@ export default class App extends Mixins(BaseMixin) { return this.$store.getters['files/getMainBackground'] } + get naviDrawer(): boolean { + return this.$store.state.naviDrawer + } + + get navigationStyle() { + return this.$store.state.gui.uiSettings.navigationStyle + } + get mainStyle() { - let style = '' + let style: any = { + paddingLeft: '0', + } if (this.mainBackground !== null) { - style = 'background-image: url(' + this.mainBackground + ');' + style.backgroundImage = 'url(' + this.mainBackground + ')' } + // overwrite padding left for the sidebar + if (this.naviDrawer && this.navigationStyle === 'iconsAndText') style.paddingLeft = '220px' + if (this.naviDrawer && this.navigationStyle === 'iconsOnly') style.paddingLeft = '56px' + return style } @@ -311,3 +299,28 @@ export default class App extends Mixins(BaseMixin) { } } + + diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue index 8050321b2..6be678c99 100644 --- a/src/components/TheSidebar.vue +++ b/src/components/TheSidebar.vue @@ -1,7 +1,7 @@