diff --git a/packages/fiori/src/Page.ts b/packages/fiori/src/Page.ts index 08fe1a4fd9b0..a851e5dbcfa9 100644 --- a/packages/fiori/src/Page.ts +++ b/packages/fiori/src/Page.ts @@ -126,7 +126,7 @@ class Page extends UI5Element { } get _contentPaddingBottom() { - return !this.fixedFooter && !this.hideFooter ? "3.5rem" : "0"; + return !this.fixedFooter && !this.hideFooter ? "3.75rem" : "0"; } get _contentTop() { diff --git a/packages/fiori/src/themes/Page.css b/packages/fiori/src/themes/Page.css index 4f2aab14a50b..c46b91f072c8 100644 --- a/packages/fiori/src/themes/Page.css +++ b/packages/fiori/src/themes/Page.css @@ -1,4 +1,3 @@ - :host(:not([hidden])) { width: 100%; height: 100%; @@ -13,6 +12,8 @@ z-index: 0; box-sizing: border-box; background-color: inherit; + display: flex; + flex-direction: column; } .ui5-page-header-root { @@ -21,11 +22,9 @@ .ui5-page-content-root { overflow: hidden auto; - position: absolute; will-change: scroll-position; width: 100%; - top: 2.75rem; - bottom: 0; + flex: 1 1 auto; box-sizing: border-box; font-size: var(--sapFontSize); color: var(--sapTextColor); @@ -34,26 +33,27 @@ .ui5-page-footer-root { width: 100%; box-sizing: border-box; - position: absolute; - bottom: 0; - left: 0; - z-index: 2; - width: 100%; } :host(:not([fixed-footer])) .ui5-page-footer-root { opacity: 1; bottom: 0.5rem; } -/*** Responsive paddings ***/ ::slotted([ui5-bar][slot="footer"][design="FloatingFooter"]) { - margin: auto; padding: 0; + position: absolute; + bottom: 10px; + box-sizing: border-box; + left: 50%; + transform: translateX(-50%); + width: 95%; + z-index: 2; } /* S Size */ @container (max-width: 599px) { + :host([floating-footer]) .ui5-page-footer-root, .ui5-page-content-root { padding: 0 1rem; @@ -72,6 +72,7 @@ /* M Size */ @container (min-width: 600px) and (max-width: 1023px) { + :host([floating-footer]) .ui5-page-footer-root, .ui5-page-content-root { padding: 0 2rem; @@ -90,6 +91,7 @@ /* L Size */ @container (min-width: 1024px) and (max-width: 1439px) { + :host([floating-footer]) .ui5-page-footer-root, .ui5-page-content-root { padding: 0 2rem; @@ -108,6 +110,7 @@ /* XL Size */ @container (min-width: 1440px) { + :host([floating-footer]) .ui5-page-footer-root, .ui5-page-content-root { padding: 0 3rem; @@ -159,6 +162,7 @@ transform: translateY(100%); opacity: 0; } + 100% { opacity: 1; } @@ -169,8 +173,9 @@ transform: translateY(-5%); opacity: 1; } + 100% { transform: translateY(100%); opacity: 0; } -} +} \ No newline at end of file