diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-11-14 13:28:05 -0800 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-11-14 13:28:05 -0800 |
| commit | 57a3141cb19e0253ff333175a9d23188689d4f8f (patch) | |
| tree | 229dcadeb964abc01125340471187d1bb07e87a5 | |
| parent | ecc7b01cee466d4893f8199abaee363c6bc4dac9 (diff) | |
| parent | f670d746342ff67c5204129ae5a93dbc3a8da94b (diff) | |
| download | nextcloud-server-57a3141cb19e0253ff333175a9d23188689d4f8f.tar.gz nextcloud-server-57a3141cb19e0253ff333175a9d23188689d4f8f.zip | |
Merge pull request #5867 from owncloud/users-groupadmindropdown
Users groupadmindropdown
| -rw-r--r-- | core/css/multiselect.css | 1 | ||||
| -rw-r--r-- | core/js/multiselect.js | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/css/multiselect.css b/core/css/multiselect.css index c25446808ea..e2a35ac3633 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -52,6 +52,7 @@ div.multiselect { display: inline-block; max-width: 400px; min-width: 150px; + min-height: 20px; padding-right: .6em; position: relative; vertical-align: bottom; diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 373fd2d41a2..2210df3bc7a 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -156,8 +156,6 @@ var newOuterWidth=Math.max((button.outerWidth()-2),settings.minOuterWidth)+'px'; var newWidth=Math.max(button.width(),settings.minWidth); var pos=button.position(); - button.css('height',button.height()); - button.css('white-space','nowrap'); button.css('width',oldWidth); button.animate({'width':newWidth},undefined,undefined,function(){ button.css('width',''); |