From: Georg Ehrke <developer@georgehrke.com>
Date: Wed, 14 Aug 2013 18:56:44 +0000 (+0200)
Subject: Merge master into oc_preview
X-Git-Tag: v6.0.0alpha2~235^2~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b5fb08c2cda4a13a1b81699f308d21b89f1723b;p=nextcloud-server.git

Merge master into oc_preview
---

4b5fb08c2cda4a13a1b81699f308d21b89f1723b
diff --cc core/css/styles.css
index db7f01cfebd,cf58a3b5f3f..18b5f9506f7
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@@ -142,8 -145,8 +145,9 @@@ a.disabled, a.disabled:hover, a.disable
  
  .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 }
 +
 +
+ 
  /* CONTENT ------------------------------------------------------------------ */
  #controls {
  	position:fixed;