Skip to content

Commit 4d1fd8f

Browse files
committed
fix: Safe Area for iOS when QModal in 'maximized' quasarframework#2421
1 parent 6f6685f commit 4d1fd8f

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

src/components/layout/layout.ios.styl

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,23 @@ $layout-transition = all .12s ease-in
7373
pointer-events auto
7474

7575
body.q-ios-statusbar-padding
76-
.q-layout-header > .q-toolbar:nth-child(2),
77-
.q-layout-header > .q-tabs:nth-child(2) .q-tabs-head
78-
.q-layout-drawer.top-padding
76+
.q-layout .q-layout-header > .q-toolbar:nth-child(2),
77+
.q-layout .q-layout-header > .q-tabs:nth-child(2) .q-tabs-head
78+
.q-layout .q-layout-drawer.top-padding,
79+
.modal:not(.minimized) .q-layout-header > .q-toolbar:nth-child(1)
7980
padding-top $ios-statusbar-height
8081
min-height ($toolbar-min-height + $ios-statusbar-height)
8182

8283
body.q-ios-statusbar-x
83-
.q-layout-header > .q-toolbar:nth-child(2),
84-
.q-layout-header > .q-tabs:nth-child(2) .q-tabs-head
85-
.q-layout-drawer.top-padding
84+
.q-layout .q-layout-header > .q-toolbar:nth-child(2),
85+
.q-layout .q-layout-header > .q-tabs:nth-child(2) .q-tabs-head
86+
.q-layout .q-layout-drawer.top-padding,
87+
.modal:not(.minimized) .q-layout-header > .q-toolbar:nth-child(1)
8688
padding-top env(safe-area-inset-top)
87-
.q-layout-footer > .q-toolbar:last-child,
88-
.q-layout-footer > .q-tabs:last-child .q-tabs-head
89-
.q-layout-drawer.top-padding
89+
.q-layout .q-layout-footer > .q-toolbar:last-child,
90+
.q-layout .q-layout-footer > .q-tabs:last-child .q-tabs-head
91+
.q-layout .q-layout-drawer.top-padding,
92+
.modal:not(.minimized) .q-layout-footer > .q-toolbar:last-child
9093
padding-bottom env(safe-area-inset-bottom)
9194
min-height ($toolbar-min-height + $ios-statusbar-height)
9295

src/components/layout/layout.mat.styl

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,23 @@ $layout-transition = all .12s ease-in
7171
pointer-events auto
7272

7373
body.q-ios-statusbar-padding
74-
.q-layout-header > .q-toolbar:nth-child(2),
75-
.q-layout-header > .q-tabs:nth-child(2) .q-tabs-head
76-
.q-layout-drawer.top-padding
74+
.q-layout .q-layout-header > .q-toolbar:nth-child(2),
75+
.q-layout .q-layout-header > .q-tabs:nth-child(2) .q-tabs-head
76+
.q-layout .q-layout-drawer.top-padding,
77+
.modal:not(.minimized) .q-layout-header > .q-toolbar:nth-child(1)
7778
padding-top $ios-statusbar-height
7879
min-height ($toolbar-min-height + $ios-statusbar-height)
7980

8081
body.q-ios-statusbar-x
81-
.q-layout-header > .q-toolbar:nth-child(2),
82-
.q-layout-header > .q-tabs:nth-child(2) .q-tabs-head
83-
.q-layout-drawer.top-padding
82+
.q-layout .q-layout-header > .q-toolbar:nth-child(2),
83+
.q-layout .q-layout-header > .q-tabs:nth-child(2) .q-tabs-head
84+
.q-layout .q-layout-drawer.top-padding,
85+
.modal:not(.minimized) .q-layout-header > .q-toolbar:nth-child(1)
8486
padding-top env(safe-area-inset-top)
85-
.q-layout-footer > .q-toolbar:last-child,
86-
.q-layout-footer > .q-tabs:last-child .q-tabs-head
87-
.q-layout-drawer.top-padding
87+
.q-layout .q-layout-footer > .q-toolbar:last-child,
88+
.q-layout .q-layout-footer > .q-tabs:last-child .q-tabs-head
89+
.q-layout .q-layout-drawer.top-padding,
90+
.modal:not(.minimized) .q-layout-footer > .q-toolbar:last-child
8891
padding-bottom env(safe-area-inset-bottom)
8992
min-height ($toolbar-min-height + $ios-statusbar-height)
9093

0 commit comments

Comments
 (0)