[Pkg-owncloud-commits] [owncloud] 32/42: modify js to move upload wrapper, modify css to match core values

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 72b680ca2d94827e579880f5516454a34ffb3cde
Author: Myles McNamara <myles at hostt.net>
Date:   Fri Jan 10 14:07:20 2014 -0500

    modify js to move upload wrapper, modify css to match core values
---
 apps/files_sharing/css/public.css | 17 ++++++++++-------
 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 3ccb35e..0f49db5 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 2e34e6f..4c0b0ad 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() {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git