From 97d91091226276c3669a10f20493f2355b2a17b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Wed, 7 Sep 2022 04:10:41 +0200 Subject: [PATCH 1/2] Adjust public share page to layout changes in Nextcloud 25 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The content now has an explicit width and height set in the server style that takes into account the margins, so it does not need to be overriden. The footer, on the other hand, now has a fixed position, but as the element is moved into the #app-content when the Talk sidebar is loaded it needs to be set as relative instead. Signed-off-by: Daniel Calviño Sánchez --- css/publicshare.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/css/publicshare.css b/css/publicshare.css index ccacb8ca26..1697e25f96 100644 --- a/css/publicshare.css +++ b/css/publicshare.css @@ -14,7 +14,6 @@ position: static; } -#content, #content.full-height { /* Always full height without header. */ height: calc(100% - 50px); @@ -33,10 +32,6 @@ min-height: 0; padding-top: 0; - /* Does not change anything in normal mode, but ensures that the element - * will stretch to the full width in full screen mode. */ - width: 100%; - /* Override margin used in server, as the header is part of the flex layout * and thus the content does not need to be pushed down. */ margin-top: 0; @@ -57,6 +52,10 @@ flex-grow: 1; } +#content footer { + position: relative; +} + #content footer p a { /* The server sets an height to the footer of 65px, but its contents are * slightly larger, which causes a scroll bar to be added to the content From a0f9c6255e98f6ec7fb1dc92a4ce2fa849e3514a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Wed, 7 Sep 2022 16:22:07 +0200 Subject: [PATCH 2/2] Fix Talk sidebar overlapping the PDF viewer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The iframe of the PDF viewer is shown with an absolute position and full width and height, so it takes the size of the first parent with a relative or fixed position. That parent was the main content element, which is also a parent of the sidebar and therefore its size includes it, so the iframe filled the content and extended behind the sidebar. To solve that now a relative position is set for #app-content, which is a sibling of the sidebar and therefore prevents the iframe from overlapping it. Signed-off-by: Daniel Calviño Sánchez --- css/publicshare.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/css/publicshare.css b/css/publicshare.css index 1697e25f96..1747a4c650 100644 --- a/css/publicshare.css +++ b/css/publicshare.css @@ -38,6 +38,8 @@ } #app-content { + position: relative; + display: flex; flex-direction: column; overflow-y: auto;