Merge branch 'master' into sharing_mail_notification_master

Conflicts:
	core/css/share.css

diff --cc apps/files/templates/index.php
Simple merge

diff --cc core/css/share.css
index b6c5a0c139026009588a3a1a7791ec97012aeb5c,10936e565209b5cb4368940099a591fc02024ca8..2a21dc6edf66d1143febbb1db50ce217a44f8a96
--- 1/core/css/share.css
--- 2/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 */