diff --git a/src/App.js b/src/App.js index 77b40b62..81d16a15 100644 --- a/src/App.js +++ b/src/App.js @@ -59,12 +59,19 @@ export default { { '-reverse': this.reverseLayout, '-no-sticky-headers': this.noSticky, - '-has-new-post-button': this.newPostButtonShown, - '-wide-timeline': this.widenTimeline + '-has-new-post-button': this.newPostButtonShown }, - '-' + this.layoutType + '-' + this.layoutType, ] }, + columnWidth() { + let type = this.$store.getters.mergedConfig.widenTimeline + console.log(type); + if (type && type !== 'off') { + return `minmax(var(--miniColumn), ${type})` + } + return 'minmax(var(--miniColumn), 45rem)' + }, pageBackground () { return this.mergedConfig.displayPageBackgrounds ? this.$store.state.users.displayBackground @@ -94,9 +101,6 @@ export default { newPostButtonShown () { return this.$store.getters.mergedConfig.alwaysShowNewPostButton || this.layoutType === 'mobile' }, - widenTimeline () { - return this.$store.getters.mergedConfig.widenTimeline - }, showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }, editingAvailable () { return this.$store.state.instance.editingAvailable }, layoutType () { return this.$store.state.interface.layoutType }, diff --git a/src/App.scss b/src/App.scss index 5071cc2e..4fc9f8b1 100644 --- a/src/App.scss +++ b/src/App.scss @@ -195,10 +195,6 @@ nav { min-height: 100vh; overflow-x: clip; - &.-wide-timeline { - --maxiColumn: minmax(var(--miniColumn), 1fr); - } - .column { --___columnMargin: var(--columnGap); diff --git a/src/App.vue b/src/App.vue index 80ebb525..6594bb3e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,6 +14,7 @@ id="content" class="app-layout container" :class="classes" + :style="{'--maxiColumn': this.columnWidth}" >