Skip to content

Commit f56c510

Browse files
authored
refactor: always use some amount of padding in app-layout navbar (#10547)
1 parent 5420232 commit f56c510

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

dev/aura/aura-view.css

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
.aura-view-header,
3535
.aura-view[slot='navbar'] > footer,
3636
.aura-view-footer[slot='navbar'] {
37-
padding-top: max(var(--vaadin-padding-m), var(--safe-area-inset-top));
37+
padding-top: max(var(--vaadin-padding-s), var(--safe-area-inset-top));
3838
}
3939

4040
.aura-view[slot='navbar'] > :is(header, footer),
@@ -44,6 +44,17 @@
4444
margin-top: calc(var(--safe-area-inset-top) * -1);
4545
}
4646

47+
.aura-view[slot='navbar'] > :is(header, footer),
48+
:is(.aura-view-header, .aura-view-footer)[slot='navbar'] {
49+
padding: 0;
50+
padding-top: var(--safe-area-inset-top);
51+
}
52+
53+
.aura-view[slot='navbar'] > footer,
54+
.aura-view-footer[slot='navbar'] {
55+
margin-inline-start: auto;
56+
}
57+
4758
.aura-view:not([slot='navbar']) > footer,
4859
.aura-view-footer:not([slot='navbar']) {
4960
padding-bottom: max(var(--vaadin-padding-m), var(--safe-area-inset-bottom));

packages/aura/src/components/app-layout.css

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
--aura-app-layout-inset: 1.5vmin;
44
--aura-app-layout-radius: var(--vaadin-radius-l);
55
--aura-app-layout-border-width: 1px;
6-
/* Use px to ensure calc/min/max work */
7-
--vaadin-app-layout-navbar-padding-top: 0px;
8-
--vaadin-app-layout-navbar-padding-bottom: 0px;
9-
--vaadin-app-layout-navbar-padding-inline-start: 0px;
10-
--vaadin-app-layout-navbar-padding-inline-end: 0px;
6+
--vaadin-app-layout-navbar-padding-top: max(var(--aura-app-layout-inset), var(--vaadin-padding-s));
7+
--vaadin-app-layout-navbar-padding-inline-start: max(var(--aura-app-layout-inset), var(--vaadin-padding-s));
8+
--vaadin-app-layout-navbar-padding-inline-end: max(var(--aura-app-layout-inset), var(--vaadin-padding-s));
119
}
1210

1311
/* Aligned with App Layout overlay breakpoint */

0 commit comments

Comments
 (0)