Mercurial > gemma
changeset 631:13bccabbf7c5
fix: usermenu or sidebar trigger arrangement of user/userdetailsview
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Wed, 12 Sep 2018 17:17:42 +0200 |
parents | 855cca0142ec |
children | f2097d2aa048 |
files | client/src/App.vue client/src/application/User.vue client/src/usermanagement/Usermanagement.vue |
diffstat | 3 files changed, 5 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/App.vue Wed Sep 12 16:11:05 2018 +0200 +++ b/client/src/App.vue Wed Sep 12 17:17:42 2018 +0200 @@ -58,8 +58,7 @@ } .middle { - margin-left: auto; - margin-right: auto; + width: 60vw; } .userinterface {
--- a/client/src/application/User.vue Wed Sep 12 16:11:05 2018 +0200 +++ b/client/src/application/User.vue Wed Sep 12 17:17:42 2018 +0200 @@ -40,7 +40,7 @@ } .usermanagementexpanded { - width: 150px; + width: $sidebar-width; } </style>
--- a/client/src/usermanagement/Usermanagement.vue Wed Sep 12 16:11:05 2018 +0200 +++ b/client/src/usermanagement/Usermanagement.vue Wed Sep 12 17:17:42 2018 +0200 @@ -195,12 +195,12 @@ }, computed: { ...mapGetters("usermanagement", ["isUserDetailsVisible"]), - ...mapGetters("application", ["sidebarCollapsed"]), + ...mapGetters("application", ["sidebarCollapsed", "isUsermenuCollapsed"]), spacerStyle() { return { spacer: true, - "spacer-expanded": !this.sidebarCollapsed, - "spacer-collapsed": this.sidebarCollapsed + "spacer-expanded": !(this.isUsermenuCollapsed && this.sidebarCollapsed), + "spacer-collapsed": this.isUsermenuCollapsed && this.sidebarCollapsed }; }, users() {