diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-02-20 14:29:23 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-02-20 14:29:23 +0100 |
| commit | 3f6d14be859e7c9f80b81a38f99b8b192e92f935 (patch) | |
| tree | a439609f26a4a9a977e037e1b3565e42be4a2dbb | |
| parent | 742f54b6d556797bbef2847e546861de0008a28a (diff) | |
| parent | 5144def99bf084f1e415a8734909363725d2925d (diff) | |
| download | nextcloud-server-3f6d14be859e7c9f80b81a38f99b8b192e92f935.tar.gz nextcloud-server-3f6d14be859e7c9f80b81a38f99b8b192e92f935.zip | |
Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
Conflicts:
core/css/styles.css
| -rw-r--r-- | core/css/styles.css | 13 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 5 |
3 files changed, 17 insertions, 3 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index bee44785f12..01c2f89b9ce 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -74,6 +74,19 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari color: #aaa; } +#header .logo { + background-image: url(../img/logo.svg); + width: 250px; + height: 118px; + margin: 0 auto; +} + +#header .logo-wide { + background-image: url(../img/logo-wide.svg); + width: 147px; + height: 32px; +} + /* INPUTS */ input[type="text"], input[type="password"], diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 6a96b17b100..91157b923a5 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -36,7 +36,7 @@ <body id="body-login"> <div class="wrapper"><!-- for sticky footer --> <header><div id="header"> - <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($theme->getName()); ?>" /> + <div class='logo'></div> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> </div></header> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index bc1c700402e..44413f5a2a8 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -45,8 +45,9 @@ <?php endif; ?> </div> <header><div id="header"> - <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" - src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> + <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"> + <div class='logo-wide'></div> + </a> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> |