diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-05-08 13:11:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-08 13:11:15 +0300 |
| commit | fecf72fb70ee1d377f819cc146bd8b608aa0ac15 (patch) | |
| tree | 2465fe635def3f71e6c9783f4758593980af11e1 /core | |
| parent | 69c5bcd804ca9ed148892b566308413cdea61c0e (diff) | |
| parent | c50b7addc7282cb05f2b4a01b45bfde0a5a4e6fb (diff) | |
Merge pull request #4632 from nextcloud/login-logo-ratio
show non landscape logos bigger on the login page
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/guest.css | 9 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/css/guest.css b/core/css/guest.css index be8b2a604c7..689eb45d65f 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -70,9 +70,16 @@ h3 { background-size: 175px; background-position: center; width: 252px; - height: 120px; + min-height: 120px; + max-height: 200px; margin: 0 auto; } + +#header .logo img { + opacity: 0; + max-width: 100%; + max-height: 200px; +} .wrapper { min-height: 100%; margin: 0 auto -70px; diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 1e2559d6960..1f38aaef5f9 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -40,6 +40,9 @@ <h1 class="hidden-visually"> <?php p($theme->getName()); ?> </h1> + <?php if(\OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?> + <img src="<?php p($theme->getLogo()); ?>"/> + <?php endif; ?> </div> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> </div> |