diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-25 19:36:58 +0400 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-25 19:36:58 +0400 |
| commit | ea8f71a19c59e7138d4a504bacc0beb410fc77e8 (patch) | |
| tree | 5c4da1ddafb6d81feb90d3a70e927e59dc0a5e0d /apps/files_sharing | |
| parent | 814bc2fd2bef739938716ae840a4db0de502422a (diff) | |
| parent | 8b93a9a237603185501d0e24e9c08705168fc553 (diff) | |
Merge branch 'master' into encryption
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/css/sharing.css | 3 | ||||
| -rw-r--r-- | apps/files_sharing/js/share.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_sharing/css/sharing.css b/apps/files_sharing/css/sharing.css index 0759af2c274..db59a3d340b 100644 --- a/apps/files_sharing/css/sharing.css +++ b/apps/files_sharing/css/sharing.css @@ -5,4 +5,5 @@ #shared_list { padding:0.5em; list-style-type: none; } #public { border-top:1px solid #ddd; padding-top:0.5em; } a.unshare { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; opacity:.5; } -a.unshare:hover { opacity:1; }
\ No newline at end of file +a.unshare:hover { opacity:1; } +#share_with { width: 16em; }
\ No newline at end of file diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index d01a07447a6..fc9e17c25c7 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -174,7 +174,7 @@ $(document).ready(function() { function createDropdown(filename, files) { var html = '<div id="dropdown" class="drop" data-file="'+files+'">'; html += '<div id="private">'; - html += '<select data-placeholder="User or Group" style="width:220px;" id="share_with" class="chzen-select">'; + html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">'; html += '<option value=""></option>'; html += '</select>'; html += '<ul id="shared_list"></ul>'; |