Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core

Conflicts:
	core/css/styles.css

diff --cc core/css/styles.css
index bee44785f123e259139f924b1580aefa652ec652,1ec2abbc8e01ffa4b3334a7f2b316ccc2b9a1102..01c2f89b9cee5dfff34ca9950d7974ada766d127
--- 1/core/css/styles.css
--- 2/core/css/styles.css
+++ b/core/css/styles.css
@@@ -46,47 -46,24 +46,60 @@@ body { background:#fefefe; font:normal 
        opacity: 1;
  }
  
 +#nojavascript {
 +      position: absolute;
 +      top: 0;
 +      bottom: 0;
 +      z-index: 999;
 +      width: 100%;
 +      text-align: center;
 +      background-color: rgba(50,0,0,0.5);
 +      color: white;
 +      text-shadow: 0px 0px 5px black;
 +      line-height: 125%;
 +      font-size: x-large;
 +}
 +#nojavascript div {
 +      width: 50%;
 +      top: 40%;
 +      position: absolute;
 +      left: 50%;
 +      margin-left: -25%;
 +}
 +#nojavascript a {
 +      color: #ccc;
 +      text-decoration: underline;
 +}
 +#nojavascript a:hover {
 +      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"], input[type="search"], input[type="number"], input[type="email"], input[type="url"],
 -textarea, select,
 +input[type="text"],
 +input[type="password"],
 +input[type="search"],
 +input[type="number"],
 +input[type="email"],
 +input[type="url"],
 +input[type="time"],
 +textarea,
 +select,
  button, .button,
 -#quota, .pager li a {
 +#quota,
 +.pager li a {
        width:10em; margin:.3em; padding:.6em .5em .4em;
        font-size:1em;
        background:#fff; color:#333; border:1px solid #ddd; outline:none;

diff --cc core/templates/layout.guest.php
Simple merge

diff --cc core/templates/layout.user.php
index bc1c700402ee1bd25fbdb8a50b2a1d09015e2329,6c0b8766f8056a560357300f8da8eabc713a8c65..44413f5a2a87d3288139d8f5556669fac91a0ce0
--- 1/core/templates/layout.user.php
--- 2/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@@ -45,19 -43,19 +45,20 @@@
                <?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>
 -                      <ul id="settings" class="svg">
 +                      <div id="settings" class="svg">
                                <span id="expand" tabindex="0" role="link">
                                        <span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
 -                                      <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" />
 -                                      <?php if ($_['enableAvatars']): ?>
 -                                      <div class="avatardiv"></div>
 -                                      <?php endif; ?>
 +                                      <img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" />
                                </span>
 +                              <?php if ($_['enableAvatars']): ?>
 +                              <div class="avatardiv"></div>
 +                              <?php endif; ?>
                                <div id="expanddiv">
 +                              <ul>
                                <?php foreach($_['settingsnavigation'] as $entry):?>
                                        <li>
                                                <a href="<?php print_unescaped($entry['href']); ?>" title=""