From 97be32e2e8291f3c5412bc9cbbdeda38552bbb81 Mon Sep 17 00:00:00 2001
From: Myles McNamara <myles@hostt.net>
Date: Fri, 10 Jan 2014 14:07:20 -0500
Subject: 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 060d4dfedc7..be53a7d8a84 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 eacd4096ed8..88dbac9c88a 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() {
-- 
cgit v1.2.3