From: kondou <kondou@ts.unde.re>
Date: Wed, 24 Jul 2013 18:35:00 +0000 (+0200)
Subject: Merge branch 'master' into css_cleanup_kondou
X-Git-Tag: v6.0.0alpha2~340^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=92af840a51c51440eb6f55d841b47c1b3f5a1b69;p=nextcloud-server.git

Merge branch 'master' into css_cleanup_kondou

Conflicts:
	core/css/styles.css
	settings/templates/personal.php
---

92af840a51c51440eb6f55d841b47c1b3f5a1b69
diff --cc core/css/styles.css
index 7c82b55deff,9e766cac7e0..d73b880a1c8
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@@ -19,26 -19,18 +19,21 @@@ body { background:#fefefe; font:normal 
  #body-user #header, #body-settings #header {
  	position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em;
  	background:#1d2d44 url('../img/noise.png') repeat;
 -	-moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
 +	-moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222;
 +	-webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222;
 +	box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222;
 +}
  
- #body-login #header {
- 	margin: -2em auto 0;
- 	text-align:center;
- 	height:10em;
- 	padding:1em 0 .5em;
- 	-moz-box-shadow:0 0 1em rgba(0, 0, 0, .5);
- 	-webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5);
- 	background:#1d2d44; /* Old browsers */
- 	background:-moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
- 	background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
- 	background:-webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
- 	background:-o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
- 	background:-ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
- 	background:linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
- 	filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
+ #body-login {
+ 	text-align: center;
+ 	background: #1d2d44; /* Old browsers */
+ 	background: url('../img/noise.png'), -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
+ 	background: url('../img/noise.png'), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
+ 	background: url('../img/noise.png'), -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
+ 	background: url('../img/noise.png'), -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
+ 	background: url('../img/noise.png'), -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
+ 	background: url('../img/noise.png'), linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
+ 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
  }
  
  #owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; }
@@@ -142,13 -140,9 +143,9 @@@ a.disabled, a.disabled:hover, a.disable
  	}
  
  
- #body-login input { font-size:1.5em; }
- #body-login input[type="text"], #body-login input[type="password"] { width:13em; }
- #body-login input.login { width:auto; float:right; padding:7px 9px 6px; }
- #remember_login { margin:.8em .2em 0 1em; vertical-align:text-bottom; }
  .searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; }
  input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
 -#select_all{ margin-top:.4em !important;}
 +#select_all{ margin-top:.4em }
  
  /* CONTENT ------------------------------------------------------------------ */
  #controls {
diff --cc settings/templates/personal.php
index e6d43a430fd,b9d9b09f5d0..7d677bdd455
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@@ -4,9 -4,7 +4,7 @@@
   * See the COPYING-README file.
   */?>
  
- <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?>
- 
 -<div class="clientsbox">
 +<div class="clientsbox center">
  	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
  	<a href="<?php p($_['clients']['desktop']); ?>" target="_blank">
  		<img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.png')); ?>" />