diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2023-09-23 14:21:49 +0200 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2023-11-02 14:55:34 +0100 |
| commit | 32ac5e7af81eee5a53e24568d779f5fb6e30583d (patch) | |
| tree | 679e3913e650084dd76ecafddef92b01ff07bc27 /core | |
| parent | c0c2362a3d04217f196cc72054b02e0152561f40 (diff) | |
| download | nextcloud-server-32ac5e7af81eee5a53e24568d779f5fb6e30583d.tar.gz nextcloud-server-32ac5e7af81eee5a53e24568d779f5fb6e30583d.zip | |
fix(theming): Make sure the footer is hidden if not content is rendered
Previously the footer was empty, but the backdrop was still shown.
This hides the footer if no text content was defined.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/guest.scss | 3 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 9 | ||||
| -rw-r--r-- | core/templates/layout.public.php | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/core/css/guest.scss b/core/css/guest.scss index f834149fd35..be352135de4 100644 --- a/core/css/guest.scss +++ b/core/css/guest.scss @@ -107,7 +107,7 @@ body { .wrapper { width: 100%; max-width: 700px; - margin-top: 10vh; + margin-block: 10vh auto; } /* Default FORM */ @@ -736,7 +736,6 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- /* FOOTER */ footer { - margin-top: auto; .info .entity-name { font-weight: bold; } diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 41f519574a1..450f8caf676 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -47,9 +47,14 @@ p($theme->getTitle()); </main> </div> </div> - <footer class="guest-box"> + <?php + $longFooter = $theme->getLongFooter(); + ?> + <footer class="guest-box <?php if ($longFooter === '') { + p('hidden'); + } ?>"> <p class="info"> - <?php print_unescaped($theme->getLongFooter()); ?> + <?php print_unescaped($longFooter); ?> </p> </footer> </body> diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php index eef140a1cd5..8ebbef828b4 100644 --- a/core/templates/layout.public.php +++ b/core/templates/layout.public.php @@ -103,7 +103,7 @@ if (isset($template) && $template->getActionCount() !== 0) { </h1> <?php print_unescaped($_['content']); ?> </main> - <?php if (isset($template) && $template->getFooterVisible()) { ?> + <?php if (isset($template) && $template->getFooterVisible() && ($theme->getLongFooter() !== '' || $_['showSimpleSignUpLink'])) { ?> <footer> <p><?php print_unescaped($theme->getLongFooter()); ?></p> <?php |