Merge branch 'master' of git.iamfabulous.de:files.iamfabulous.de

1 files changed, 56 insertions, 3 deletions

diff --git a/www/static/browser.css b/www/static/browser.css
index a6031dc..c040695 100644
--- a/www/static/browser.css
+++ b/www/static/browser.css
@@ -86,7 +86,7 @@ td{
 }
 
 
-input.new-folder-input[type=text], input.new-folder-input[type=checkbox]{
+input.new-folder-input[type=text]{
 	border: none;
 	box-shadow: inset 0px 0px 1px 1px #1F3D4C;
 	border-radius: 0;
@@ -94,21 +94,74 @@ input.new-folder-input[type=text], input.new-folder-input[type=checkbox]{
 	font-size: 25px;
 	margin-top: 15px;
 	width: 395px;
-	display:block;
 	padding-left: 5px;
 }
 
+/*input.new-folder-input[type=checkbox]*/
+
+input[type=checkbox]{
+		display:inline;
+		margin-left: 5px;
+		width: 10px;
+}
+
+
 input.new-folder-input:focus{
 	background: #D6E0E5
 }
 
+
+#upload-bg{
+	width: 100%;
+	height: 100%;
+	background: white;
+	position: fixed;
+	z-index: 99;
+	top: 0px;
+	opacity: 0.75;
+	visibility: hidden;
+}
+
+#upload-form{
+
+}
+
+#upload-area{
+	height: 190px;
+	width: 400px;
+	position: fixed;
+	top: 50%;
+	margin-top: -100px;
+	
+	padding: 10px;
+	
+	left: 50%;
+	margin-left: -200px;
+	
+	border: 1px solid black;
+}
+
+
+
+input.upload-input[type=file]{
+	border: none;
+	margin-top: 15px;
+	margin-bottom: 15px;
+	display:block;
+	padding-left: 5px;
+}
+
 #button-input{
 	height: 40px;
 	width: 120px;
-	display:inline;
 	border: none;
 	box-shadow: inset 0px 0px 1px 1px #1F3D4C;
 	border-radius: 0;
 	font-size: 25px;
 	margin-top: 15px;
+	display:block;
+}
+label{
+	display: inline;
 }
+dis
\ No newline at end of file