22: where (: host ) {
33 --aura-app-layout-inset : 1.5vmin ;
44 --aura-app-layout-radius : var (--vaadin-radius-l );
5- --_aura-mdl- border : 1px ;
5+ --aura-app-layout- border-width : 1px ;
66 /* Use px to ensure calc/min/max work */
77 --vaadin-app-layout-navbar-padding-top : 0px ;
88 --vaadin-app-layout-navbar-padding-bottom : 0px ;
1212
1313/* Aligned with App Layout overlay breakpoint */
1414@media (width <= 800px), (height <= 600px) {
15- html {
15+ : where (: root ),
16+ : where (: host ) {
1617 --aura-app-layout-inset : 0px !important ;
17- --_aura-mdl- border : 0px ;
18+ --aura-app-layout- border-width : 0px ;
1819 }
1920}
2021
2122vaadin-app-layout {
2223 --_app-layout-radius : clamp (0px , var (--aura-app-layout-radius ), var (--aura-app-layout-inset ) * 100 );
23- padding-block : var (--aura-app-layout-inset );
24+ padding-bottom : var (--aura-app-layout-inset );
2425 padding-inline-end : var (--aura-app-layout-inset );
25- padding-top : calc (var (--aura-app-layout-inset ) + var (--_vaadin-app-layout-navbar-offset-size ));
26+ padding-top : max (var (--aura-app-layout-inset ), var (--_vaadin-app-layout-navbar-offset-size ));
2627}
2728
2829vaadin-app-layout [overlay ]::part (drawer ) {
@@ -32,7 +33,8 @@ vaadin-app-layout[overlay]::part(drawer) {
3233 backdrop-filter : var (--aura-overlay-backdrop-filter );
3334}
3435
35- vaadin-app-layout : is ([overlay ], : not ([drawer-opened ])) {
36+ vaadin-app-layout : is ([overlay], : not ([drawer-opened])),
37+ vaadin-app-layout:not(: has ([slot='drawer'])) {
3638 padding-inline-start : var (--aura-app-layout-inset );
3739}
3840
@@ -48,6 +50,10 @@ vaadin-app-layout:not([overlay])::part(drawer) {
4850 padding-inline : max (0px , var (--aura-app-layout-inset ) - var (--vaadin-padding-s ));
4951}
5052
53+ vaadin-app-layout [has-navbar ]::part (drawer ) {
54+ padding-top : var (--safe-area-inset-top );
55+ }
56+
5157vaadin-app-layout > vaadin-scroller [slot = 'drawer' ] {
5258 --vaadin-scroller-padding-inline : var (--vaadin-padding-m );
5359 scrollbar-width : thin;
@@ -72,9 +78,9 @@ vaadin-app-layout > :nth-child(1 of :not([slot])):nth-last-child(1 of :not([slot
7278 min-height : 100% ;
7379 box-sizing : border-box;
7480 border-radius : var (--_app-layout-radius );
75- border : var (--_aura-mdl- border ) solid var (--vaadin-border-color-secondary );
76- border-block-width : min (var (--aura-app-layout-inset ), var (--_aura-mdl- border ));
77- border-inline-end- width : min (var (--aura-app-layout-inset ), var (--_aura-mdl- border ));
81+ border : var (--aura-app-layout- border-width ) solid var (--vaadin-border-color-secondary );
82+ border-block-width : min (var (--aura-app-layout-inset ), var (--aura-app-layout- border-width ));
83+ border-inline-width : min (var (--aura-app-layout-inset ), var (--aura-app-layout- border-width ));
7884}
7985
8086vaadin-app-layout > vaadin-master-detail-layout : nth-child (1 of : not ([slot ])): nth-last-child (1 of : not ([slot ])) {
@@ -111,32 +117,24 @@ vaadin-app-layout > vaadin-master-detail-layout:nth-child(1 of :not([slot])):nth
111117 }
112118
113119 & ::part (backdrop ) {
114- border-radius : calc (var (--_app-layout-radius ) - var (--_aura-mdl- border ));
120+ border-radius : calc (var (--_app-layout-radius ) - var (--aura-app-layout- border-width ));
115121 }
116122
117123 & : is ([drawer ][has-detail ]) {
118124 border-color : light-dark (var (--vaadin-border-color ), var (--vaadin-border-color-secondary ));
119125 }
120126}
121127
122- vaadin-app-layout [has-navbar ][has-drawer ] {
123- padding-top : var (--_vaadin-app-layout-navbar-offset-size );
124-
125- & ::part (drawer ) {
126- padding-top : var (--safe-area-inset-top );
127- }
128- }
129-
130- vaadin-app-layout [has-drawer ]: not ([overlay ]): not ([drawer-opened ])
128+ vaadin-app-layout [has-drawer ][drawer-opened ]: not ([overlay ])
131129 > : nth-child (1 of : not ([slot ])): nth-last-child (1 of : not ([slot ])) {
132- border-inline-start-width : min ( var (--aura-app-layout-inset ) , var ( --_aura-mdl- border) );
130+ border-inline-start-width : var (--aura-app-layout-border-width );
133131}
134132
135133vaadin-app-layout [has-navbar ][has-drawer ][drawer-opened ]: not ([overlay ])
136134 > : nth-child (1 of : not ([slot ])): nth-last-child (1 of : not ([slot ])) {
137135 border-start-start-radius : var (--aura-app-layout-radius );
138136}
139137
140- vaadin-app-layout [has-navbar ][ has-drawer ] > : nth-child (1 of : not ([slot ])): nth-last-child (1 of : not ([slot ])) {
141- border-top-width : var (--_aura-mdl- border );
138+ vaadin-app-layout [has-navbar ] > : nth-child (1 of : not ([slot ])): nth-last-child (1 of : not ([slot ])) {
139+ border-top-width : var (--aura-app-layout- border-width );
142140}
0 commit comments