From 9de3b5710719658ef75740c0bd930423cc7c209c Mon Sep 17 00:00:00 2001
From: Kate Arzamastseva <pshns@ukr.net>
Date: Sun, 21 Aug 2011 02:16:39 +0300
Subject: issue #44 uploader fixes, #45 browser testing

---
 lib/tpl/default/_fileuploader.css | 12 ++++++++----
 lib/tpl/default/mediamanager.css  |  7 +++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'lib/tpl')

diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
index 0e53f8187..9e60393a0 100644
--- a/lib/tpl/default/_fileuploader.css
+++ b/lib/tpl/default/_fileuploader.css
@@ -8,7 +8,6 @@
     border: 1px solid __border__;
     color: __text__;
     background-color: __background__;
-    vertical-align: middle;
     text-decoration: none;
     font-size: 100%;
     cursor: pointer;
@@ -18,6 +17,11 @@
     background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
 }
 
+* html .qq-upload-button,
+*+html .qq-upload-button {
+    display: inline;
+}
+
 .qq-upload-button-focus {
     outline: 1px dotted black;
 }
@@ -84,8 +88,9 @@
     padding-left: 10px;
 }
 
-.qq-uploader #dw__ow {
-    margin: 10px 3px -5px 10px;
+.qq-uploader .dw__ow {
+    margin-left: 10px;
+    margin-right: 3px;
 }
 
 .qq-uploader .check {
@@ -93,7 +98,6 @@
 }
 
 .qq-uploader #mediamanager__upload_button {
-    margin-top: -5px;
     margin-bottom: 10px;
 }
 
diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css
index ad371ee3d..245bb5550 100644
--- a/lib/tpl/default/mediamanager.css
+++ b/lib/tpl/default/mediamanager.css
@@ -22,6 +22,7 @@
     padding: 0;
     margin: 0;
     text-align: left;
+    position: relative;
 }
 
 #mediamanager__layout .background-container {
@@ -359,10 +360,16 @@ form.meta textarea.edit {
 * html #mediamanager__diff_table li {
     display: inline;
 }
+
 *+html #mediamanager__diff_table li {
     display: inline;
 }
 
+/* For IE7 */
+*:first-child+html #mediamanager__diff_table li {
+    width: 45%;
+}
+
 /* Image diff */
 
 #mediamanager__layout dl.img_tags dd.highlighted{
-- 
cgit v1.2.3