diff options
author | Myles McNamara <myles@hostt.net> | 2014-01-10 14:07:20 -0500 |
---|---|---|
committer | Morris Jobke <morris.jobke@gmail.com> | 2014-01-22 11:36:38 +0100 |
commit | 72b680ca2d94827e579880f5516454a34ffb3cde (patch) | |
tree | 9ff0c3e5cec1d6fda85460e5a57c821e83b702a4 | |
parent | 5e1c3732e5d3345fe97b1256a9f0b46673f16450 (diff) | |
download | nextcloud-server-72b680ca2d94827e579880f5516454a34ffb3cde.tar.gz nextcloud-server-72b680ca2d94827e579880f5516454a34ffb3cde.zip |
modify js to move upload wrapper, modify css to match core values
-rw-r--r-- | apps/files_sharing/css/public.css | 17 | ||||
-rw-r--r-- | apps/files_sharing/js/public.js | 3 |
2 files changed, 12 insertions, 8 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 3ccb35e327a..0f49db564d9 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -141,10 +141,13 @@ thead{ .directLink { margin-bottom: 20px; } - .directLink label { - font-weight: normal; - } - .directLink input { - margin-left: 10px; - width: 300px; - } +.directLink label { + font-weight: normal; +} +.directLink input { + margin-left: 10px; + width: 300px; +} +.public_actions { + padding: 0.3em; +} diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 2e34e6f9bc5..4c0b0ad9d48 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -59,7 +59,8 @@ $(document).ready(function() { }); // Add Uploadprogress Wrapper to controls bar - $('#controls').append($('#additional_controls div#uploadprogresswrapper')); + $('#controls').append($('#controls .actions div#uploadprogresswrapper')); + $('#uploadprogresswrapper').addClass('public_actions'); // Cancel upload trigger $('#cancel_upload_button').click(function() { |