From e84a7823ae551577db3978d40abb90f70c4ff395 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 3 Apr 2014 13:32:18 +0000
Subject: [PATCH] fixed fileupload overlapping other icons

---
 etemplate/templates/default/etemplate2.css | 11 +++++------
 filemanager/templates/default/app.css      |  5 +----
 filemanager/templates/pixelegg/app.css     | 19 ++++++++-----------
 filemanager/templates/pixelegg/app.less    | 14 +++++---------
 4 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index c4f4663b3b..b778b5cea1 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -492,22 +492,21 @@ div.et2_file {
 /* Customize file upload styling */
 span.et2_file_span{
 	display: block;
-	background-position: left;
-	background-image: url(images/upload.png);
+	background-position: 2px;
+	background-image: url(../../../phpgwapi/templates/default/images/upload.png);
 	background-repeat: no-repeat;
 	background-size: 16px;
 	cursor: pointer;
-
 	height: 15px;
 	text-align: left;
-	text-indent: 20px;
+	text-indent: 18px;
+	white-space: nowrap;
 }
 div.et2_file input.et2_file_upload{
 	position: absolute;
 	top: 4px;
-	padding-right: 100%;
 	cursor: pointer;
-	margin-left: -84px;
+	width: 143px;
 	opacity: 0;
 }
 /**
diff --git a/filemanager/templates/default/app.css b/filemanager/templates/default/app.css
index d087f5db73..87a0eb1605 100644
--- a/filemanager/templates/default/app.css
+++ b/filemanager/templates/default/app.css
@@ -42,7 +42,7 @@ div.filemanager_navigation > * {
 div.filemanager_navigation > label {
 	position: absolute;
 	left: 50px;
-	right: 565px;
+	right: 385px;
 	padding-top: 3px;
 	font-size: 140%;
 	white-space: nowrap;
@@ -50,9 +50,6 @@ div.filemanager_navigation > label {
 div.filemanager_navigation > label > input {
 	width: 100%;
 }
-input#filemanager-index_upload {
-	width: 315px;
-}
 #filemanager-index-buttons div.et2_file .progress {
   position: absolute;
   right: 0px;
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index c2a36ba89d..1fbc7cc93e 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -74,7 +74,7 @@ div.filemanager_navigation > * {
 div.filemanager_navigation > label {
   position: absolute;
   left: 50px;
-  right: 565px;
+  right: 385px;
   padding-top: 3px;
   font-size: 140%;
   white-space: nowrap;
@@ -82,8 +82,9 @@ div.filemanager_navigation > label {
 div.filemanager_navigation > label > input {
   width: 100%;
 }
-input#filemanager-index_upload {
-  width: 315px;
+#filemanager-index-buttons div.et2_file .progress {
+  position: absolute;
+  right: 0px;
 }
 /**
  * Select file dialog
@@ -120,10 +121,9 @@ input.displayNone {
 /*//******************************************************************
 // iframe*/
 #filemanager-index_filemanager-index-header_left {
-  loat: left;
+  float: left;
   height: 36px;
   width: 98%;
-  margin: 0 17px;
 }
 div.filemanager_navigation {
   position: relative;
@@ -178,12 +178,10 @@ img#filemanager-index_home {
 /*Pfad */
 div.filemanager_navigation > label {
   float: left;
-  /*position: absolute;*/
-  left: 55px;
-  right: 567px;
-  /*padding-top: 3px;*/
+  left: 64px;
+  right: 485px;
   font-size: 140%;
-  top: 0px;
+  top: 5px;
 }
 /*Buttons / Tarp / FileUpload*/
 #filemanager-index_buttons {
@@ -209,7 +207,6 @@ div.filemanager_navigation > label > input {
 }
 #filemanager-index .et2_file input#filemanager-index_upload {
   color: #ffffff;
-  width: 250px;
   background-color: #0c5da5;
 }
 #filemanager-index .et2_file input#filemanager-index_upload:hover {
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index 45724551f3..642779a3a0 100644
--- a/filemanager/templates/pixelegg/app.less
+++ b/filemanager/templates/pixelegg/app.less
@@ -26,10 +26,9 @@
 // iframe*/
 
 #filemanager-index_filemanager-index-header_left {
-   loat: left;
+    float: left;
     height: 36px;
     width: 98%;
-    margin: 0 17px;
 }
 
 div.filemanager_navigation {
@@ -71,12 +70,10 @@ div.filemanager_navigation {
  /*Pfad */
 div.filemanager_navigation > label {
     float: left;
-    /*position: absolute;*/
-    left: 55px;
-    right: 567px;
-    /*padding-top: 3px;*/
+    left: 64px;
+    right: 485px;
     font-size: 140%;
-    top: 0px;
+    top: 5px;
 }
 
 
@@ -114,8 +111,7 @@ div.filemanager_navigation > label > input {
        /*background-color: @egw_color_2_a;*/
        input#filemanager-index_upload {
             color: @gray_0;
-            width: 250px;
-            background-color: @egw_color_2_a;
+             background-color: @egw_color_2_a;
         &:hover {.Complete_Button_add_only_plus_hover;}
         &:active {background-color: @color_positive_action_active !important;}
         }