diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-12-12 21:49:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 21:49:29 +0100 |
| commit | f55dd96c0894ea1e9091306a781a451ef687633e (patch) | |
| tree | 51303c24730088007f44e8f5effd52d4268c8e5c | |
| parent | e17315954f98c25138fda154429f3fb2aee74ea2 (diff) | |
| parent | 21fbcba68d3ce49bf31960276c0cbfe0f158dda4 (diff) | |
| download | nextcloud-server-f55dd96c0894ea1e9091306a781a451ef687633e.tar.gz nextcloud-server-f55dd96c0894ea1e9091306a781a451ef687633e.zip | |
Merge pull request #7470 from nextcloud/guest-flex-fix
Fixed firefox guest header height
| -rw-r--r-- | core/css/guest.css | 5 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/css/guest.css b/core/css/guest.css index b03e8d55efb..4256c66302f 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -86,7 +86,7 @@ body { } .wrapper { width: 300px; - margin-top: 10%; + margin-top: 10vh; } /* Default FORM */ @@ -721,8 +721,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- } /* FOOTER */ -footer, -.push { +footer { height: 70px; margin-top: auto; } diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index ce0eccb971d..4d06fc294d5 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -38,7 +38,6 @@ </header> <?php endif; ?> <?php print_unescaped($_['content']); ?> - <div class="push"></div><!-- for sticky footer --> </div> </div> <footer role="contentinfo"> |