From 5e867d6415591be62e101306a42b48eeeaaa3489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 15 Aug 2018 08:11:13 +0200 Subject: [PATCH] Fix footer and public min-height MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/public.scss | 25 +++++++++++++++++++++++-- core/css/styles.scss | 19 ------------------- core/templates/layout.public.php | 2 +- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/core/css/public.scss b/core/css/public.scss index 0c04b07ab0..a4e7ed579b 100644 --- a/core/css/public.scss +++ b/core/css/public.scss @@ -1,3 +1,5 @@ +$footer-height: 60px; + #body-public { .header-right { @@ -36,8 +38,9 @@ } #content { - height: initial; - min-height: calc(100vh - 160px); + // 100% - footer + min-height: calc(100% - #{$footer-height}); + } /** don't apply content header padding on the base layout */ @@ -64,4 +67,22 @@ form input[type='checkbox']+label { text-align: center; } + + /* public footer */ + footer { + position: relative; + display: flex; + align-items: center; + justify-content: center; + height: $footer-height; + p { + color: var(--color-text-lighter); + a { + color: var(--color-text-lighter); + font-weight: 600; + padding: 13px; + margin: -13px; + } + } + } } diff --git a/core/css/styles.scss b/core/css/styles.scss index ad82a7acbf..d1b43a3281 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -1049,25 +1049,6 @@ div.crumb { } } -/* public footer */ - -#body-public footer { - position: relative; - text-align: center; - .info { - color: var(--color-text-lighter); - text-align: center; - margin: 0 auto; - padding: 20px 0; - a { - color: var(--color-text-lighter); - font-weight: 600; - padding: 13px; - margin: -13px; - } - } -} - /* LEGACY FIX only - do not use fieldsets for settings */ fieldset { diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php index 74ce43d4f8..13baf19401 100644 --- a/core/templates/layout.public.php +++ b/core/templates/layout.public.php @@ -78,7 +78,7 @@ getFooterVisible()) { ?>
-

getLongFooter()); ?>

+

getLongFooter()); ?>