Skip to content

Commit 2313daa

Browse files
authored
fix(ui5-page): correct content overlap with shellbar header (#12124)
1 parent e548778 commit 2313daa

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

packages/fiori/src/Page.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -132,17 +132,6 @@ class Page extends UI5Element {
132132
get _contentTop() {
133133
return this.header.length ? "2.75rem" : "0rem";
134134
}
135-
136-
get styles() {
137-
return {
138-
content: {
139-
"padding-bottom": this.footer.length && this._contentPaddingBottom,
140-
"scroll-padding-bottom": this.footer.length && this._contentPaddingBottom,
141-
"bottom": this.footer.length && this._contentBottom,
142-
"top": this._contentTop,
143-
},
144-
};
145-
}
146135
}
147136

148137
Page.define();

packages/fiori/src/PageTemplate.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default function PageTemplate(this: Page) {
1515
class="ui5-page-content-root" style={{
1616
"padding-bottom": this.footer.length && this._contentPaddingBottom,
1717
"scroll-padding-bottom": this.footer.length && this._contentPaddingBottom,
18+
"margin-bottom": this.footer.length && this._contentBottom,
1819
"bottom": this.footer.length && this._contentBottom,
1920
"top": this._contentTop,
2021
}}>

packages/fiori/src/themes/Page.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
z-index: 0;
1414
box-sizing: border-box;
1515
background-color: inherit;
16+
display: flex;
17+
flex-direction: column;
1618
}
1719

1820
.ui5-page-header-root {
1921
z-index: 1;
22+
flex-shrink: 0;
2023
}
2124

2225
.ui5-page-content-root {
2326
overflow: hidden auto;
24-
position: absolute;
2527
will-change: scroll-position;
26-
width: 100%;
27-
top: 2.75rem;
28-
bottom: 0;
28+
flex: 1;
2929
box-sizing: border-box;
3030
font-size: var(--sapFontSize);
3131
color: var(--sapTextColor);

0 commit comments

Comments
 (0)