Skip to content

Commit 17ffc08

Browse files
committed
feat: QLayout further work
1 parent ec9f826 commit 17ffc08

File tree

4 files changed

+13
-346
lines changed

4 files changed

+13
-346
lines changed

dev/components/new-layout/new-layout.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@
7272
<div v-for="n in 60">{{n}} Right drawer</div>
7373
</q-layout-drawer>
7474

75-
<router-view />
75+
<q-transition enter="fadeIn" leave="fadeOut" mode="out-in">
76+
<router-view />
77+
</q-transition>
7678
</q-page-container>
7779
</q-new-layout>
7880

src/components/new-layout/QLayoutDrawer.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ export default {
124124
console.log('onLayout', val)
125125
this.__update('space', val)
126126
this.layout.__animate()
127+
},
128+
$route () {
129+
if (this.onScreenOverlay) {
130+
console.log('on screen overlay; closing')
131+
this.__updateModel(false)
132+
}
127133
}
128134
},
129135
computed: {
@@ -142,7 +148,7 @@ export default {
142148
return this.value && !this.mobileView && !this.overlay
143149
},
144150
onScreenOverlay () {
145-
return this.value && this.overlay
151+
return this.value && !this.mobileView && this.overlay
146152
},
147153
backdropClass () {
148154
return {

src/components/new-layout/QLayoutDrawer_ORIG.js

Lines changed: 0 additions & 340 deletions
This file was deleted.

src/components/new-layout/new-layout.mat.styl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
top 0
1818
bottom 0
1919
background $layout-aside-background
20-
&.fixed
21-
z-index $z-side
22-
&.on-screen
23-
box-shadow $layout-aside-shadow
20+
z-index $z-side
21+
&.fixed.on-screen
22+
box-shadow $layout-aside-shadow
2423
&.on-top
2524
z-index $z-fixed-side
2625
.q-layout-drawer-left

0 commit comments

Comments
 (0)