diff --git a/src/admin/admin.vue b/src/admin/admin.vue index 97a8b22ff..9b18023d3 100644 --- a/src/admin/admin.vue +++ b/src/admin/admin.vue @@ -2,8 +2,15 @@
- - + + +
@@ -18,6 +25,8 @@ name: "AdminPage", data(){ return { + isMenuCompressed: false, + activeRoute: '/collections' } }, components: { @@ -25,7 +34,15 @@ TainacanHeader }, created() { - this.$userPrefs.init() + this.$userPrefs.init(); + this.isMenuCompressed = (this.$route.params.collectionId != undefined); + this.activeRoute = this.$route.name; + }, + watch: { + '$route' (to) { + this.isMenuCompressed = (to.params.collectionId != undefined); + this.activeRoute = to.name; + } } } @@ -63,7 +80,7 @@ margin: $header-height auto 0 auto; position: relative; overflow-y: auto; - height: calc(100% - 58px); + height: calc(100% - 52px); @media screen and (max-width: 769px) { & { @@ -77,5 +94,24 @@ } } + #menu-compress-button { + position: absolute; + z-index: 99999; + top: 70px; + max-width: 23px; + height: 21px; + width: 23px; + border: none; + background-color: $primary-light; + color: $tertiary; + padding: 0px; + border-top-right-radius: 2px; + border-bottom-right-radius: 2px; + + .icon { + margin-top: -1px; + } + } + diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue index 70cc97f5e..1a748465b 100644 --- a/src/admin/components/edition/item-edition-form.vue +++ b/src/admin/components/edition/item-edition-form.vue @@ -1,15 +1,14 @@