Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
Conflicts: core/css/styles.css
This commit is contained in:
commit
3f6d14be85
|
@ -74,6 +74,19 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
|
||||||
color: #aaa;
|
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 */
|
/* INPUTS */
|
||||||
input[type="text"],
|
input[type="text"],
|
||||||
input[type="password"],
|
input[type="password"],
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
<body id="body-login">
|
<body id="body-login">
|
||||||
<div class="wrapper"><!-- for sticky footer -->
|
<div class="wrapper"><!-- for sticky footer -->
|
||||||
<header><div id="header">
|
<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 id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
|
||||||
</div></header>
|
</div></header>
|
||||||
|
|
||||||
|
|
|
@ -45,8 +45,9 @@
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
</div>
|
</div>
|
||||||
<header><div id="header">
|
<header><div id="header">
|
||||||
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
|
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud">
|
||||||
src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
|
<div class='logo-wide'></div>
|
||||||
|
</a>
|
||||||
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
|
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
|
||||||
<div id="settings" class="svg">
|
<div id="settings" class="svg">
|
||||||
<span id="expand" tabindex="0" role="link">
|
<span id="expand" tabindex="0" role="link">
|
||||||
|
|
Loading…
Reference in New Issue