Skip to content

Commit 7e72531

Browse files
committed
fix: iOS cordova platform -- top padding
1 parent c036edf commit 7e72531

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

src/components/layout/QLayoutDrawer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ export default {
175175
'on-screen': this.showing,
176176
'off-screen': !this.showing,
177177
'transition-generic': !this.inTransit,
178-
'top-padding': this.fixed || this.headerSlot
178+
'top-padding': true
179179
}
180180
},
181181
belowStyle () {
@@ -189,7 +189,7 @@ export default {
189189
'off-screen': !onScreen,
190190
'on-screen': onScreen,
191191
'fixed': this.fixed || !this.onLayout,
192-
'top-padding': this.fixed || this.headerSlot
192+
'top-padding': this.headerSlot
193193
}
194194
},
195195
aboveStyle () {

src/components/layout/QLayoutFooter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ export default {
8888
'class': this.computedClass,
8989
style: this.computedStyle
9090
}, [
91+
this.$slots.default,
9192
h(QResizeObservable, {
9293
on: { resize: this.__onResize }
93-
}),
94-
this.$slots.default
94+
})
9595
])
9696
},
9797
created () {

src/components/layout/QLayoutHeader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ export default {
9292
'class': this.computedClass,
9393
style: this.computedStyle
9494
}, [
95+
this.$slots.default,
9596
h(QResizeObservable, {
9697
on: { resize: this.__onResize }
97-
}),
98-
this.$slots.default
98+
})
9999
])
100100
},
101101
created () {

src/components/layout/layout.ios.styl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ body
7171
overflow-x hidden
7272

7373
&.cordova.platform-ios
74-
.q-layout-header > .q-toolbar:first-child, .q-layout-drawer.top-padding
74+
.q-layout-header > .q-toolbar:first-child,
75+
.q-layout-header > .q-tabs:first-child .q-tabs-head
76+
.q-layout-drawer.top-padding
7577
padding-top $ios-statusbar-height
7678
min-height ($toolbar-min-height + $ios-statusbar-height)
7779

src/components/layout/layout.mat.styl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ body
6969
overflow-x hidden
7070

7171
&.cordova.platform-ios
72-
.q-layout-header > .q-toolbar:first-child, .q-layout-drawer.top-padding
72+
.q-layout-header > .q-toolbar:first-child,
73+
.q-layout-header > .q-tabs:first-child .q-tabs-head
74+
.q-layout-drawer.top-padding
7375
padding-top $ios-statusbar-height
7476
min-height ($toolbar-min-height + $ios-statusbar-height)
7577

0 commit comments

Comments
 (0)