From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Wed, 2 Oct 2013 21:33:50 +0000 (+0200)
Subject: Merge branch 'master' into sharing_mail_notification_master
X-Git-Tag: v6.0.0alpha2~101^2~1^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9c23c3449b8f9c9d847a64c9a2c7127b87054c7c;p=nextcloud-server.git

Merge branch 'master' into sharing_mail_notification_master

Conflicts:
	core/css/share.css
---

9c23c3449b8f9c9d847a64c9a2c7127b87054c7c
diff --cc core/css/share.css
index b6c5a0c1390,10936e56520..2a21dc6edf6
--- a/core/css/share.css
+++ b/core/css/share.css
@@@ -2,36 -2,36 +2,36 @@@
   This file is licensed under the Affero General Public License version 3 or later.
   See the COPYING-README file. */
  
-  #dropdown {
-  	background:#eee;
-  	border-bottom-left-radius:1em;
-  	border-bottom-right-radius:1em;
-  	box-shadow:0 1px 1px #777;
-  	display:block;
-  	margin-right:7em;
-  	position:absolute;
-  	right:0;
-  	width:25em;
-  	z-index:500;
-  	padding:1em;
-  }
- 
-  #shareWithList {
-  	list-style-type:none;
-  	padding:.5em;
-  }
- 
-  #shareWithList li {
-  	padding-top:.1em;
-  }
- 
-  #shareWithList li:first-child {
- 	 white-space:normal;
-  }
- 
-  #shareWithList .cruds {
- 	 margin-left:-10px;
-  }
+ #dropdown {
+ 	background:#eee;
+ 	border-bottom-left-radius: 5px;
+ 	border-bottom-right-radius: 5px;
+ 	box-shadow:0 1px 1px #777;
+ 	display:block;
+ 	margin-right:7em;
+ 	position:absolute;
+ 	right:0;
 -	width:19em;
++	width:25em;
+ 	z-index:500;
+ 	padding:1em;
+ }
+ 
+ #shareWithList {
+ 	list-style-type:none;
+ 	padding:.5em;
+ }
+ 
+ #shareWithList li {
+ 	padding-top:.1em;
+ }
+ 
+ #shareWithList li:first-child {
+ 	white-space:normal;
+ }
+ 
+ #shareWithList .cruds {
+ 	margin-left:-10px;
+ }
  
  #shareWithList .unshare img, #shareWithList .showCruds img {
  	vertical-align:text-bottom; /* properly align icons */