From c4f849f151519f8fed0348ddf41fd85be4d44e4a Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 19 Jan 2009 23:54:59 -0700
Subject: [PATCH] Fix CSS for warning alert messages; other CSS fixes

---
 imp/folders.php                    | 4 ++--
 imp/templates/folders/folders.html | 2 +-
 imp/themes/screen-dimp.css         | 6 ++++--
 imp/themes/screen.css              | 8 +++++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/imp/folders.php b/imp/folders.php
index c633fab51..f33811447 100644
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -26,9 +26,9 @@ function _image($name, $alt, $type)
     }
 
     if ($type == 'folder') {
-        $cache[$type][$val] = Horde::img($name['icon'], $name['alt'], 'style="vertical-align:middle"', $name['icondir']);
+        $cache[$type][$val] = Horde::img($name['icon'], $name['alt'], null, $name['icondir']);
     } else {
-        $cache[$type][$val] = Horde::img('tree/' . $name, $alt, 'style="vertical-align:middle"', $GLOBALS['registry']->getImageDir('horde'));
+        $cache[$type][$val] = Horde::img('tree/' . $name, $alt, null, $GLOBALS['registry']->getImageDir('horde'));
     }
 
     return $cache[$type][$val];
diff --git a/imp/templates/folders/folders.html b/imp/templates/folders/folders.html
index 1cb0393cb..c27a37203 100644
--- a/imp/templates/folders/folders.html
+++ b/imp/templates/folders/folders.html
@@ -1,5 +1,5 @@
 <loop:rows>
 <div class="<tag:rows.class />">
- &nbsp;<label><input type="checkbox" class="checkbox" name="folder_list[]" <if:rows.nocheckbox>disabled="disabled" </if:rows.nocheckbox>value="<tag:rows.mbox_val />" /><span style="display: none;"><gettext>Select mailbox</gettext></span></label> <tag:rows.line /> <tag:rows.name /><if:rows.polled> (<tag:rows.unseen />/<tag:rows.msgs />)</if:rows.polled> <if:rows.editvfolder>&nbsp;&nbsp;[<tag:rows.delvfolder />] [<tag:rows.editvfolder />]</if:rows.editvfolder>
+ &nbsp;<input type="checkbox" class="checkbox" name="folder_list[]" <if:rows.nocheckbox>disabled="disabled" </if:rows.nocheckbox>value="<tag:rows.mbox_val />" /> <tag:rows.line /> <tag:rows.name /><if:rows.polled> (<tag:rows.unseen />/<tag:rows.msgs />)</if:rows.polled> <if:rows.editvfolder>&nbsp;&nbsp;[<tag:rows.delvfolder />] [<tag:rows.editvfolder />]</if:rows.editvfolder>
 </div>
 </loop:rows>
diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 563dbd423..fc50b4860 100644
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -865,7 +865,8 @@ a.address:hover img {
     background: #5db110 6px 6px no-repeat;
 }
 #alerts div.horde-error {
-    background: #e81222 url("graphics/error.png") 99% 50% no-repeat;
+    background-color: #e81222;
+    background-image: url("graphics/error.png");
     border-color: maroon;
 }
 #alerts div.horde-message {
@@ -875,7 +876,8 @@ a.address:hover img {
     background-image: url("graphics/success.png");
 }
 #alerts div.horde-warning, #alerts div.dimp-sticky, #alerts div.dimp-sticky {
-    background: #ebe20c url("graphics/warning.png");
+    background-color: #ebe20c;
+    background-image: url("graphics/warning.png");
     border-color: #807b00;
     color: #000;
 }
diff --git a/imp/themes/screen.css b/imp/themes/screen.css
index 7dda01405..6974195d4 100644
--- a/imp/themes/screen.css
+++ b/imp/themes/screen.css
@@ -25,7 +25,8 @@
     vertical-align: middle;
 }
 .messageList img {
-    vertical-align: middle;
+    padding-right: 1px;
+    vertical-align: bottom;
 }
 
 /* Newmail alerts. */
@@ -138,6 +139,11 @@ form#search div {
     padding: 1px;
 }
 
+/* Folder view. */
+#fmanager div, #fmanager div input {
+    vertical-align: middle;
+}
+
 /* Style for div that fixes KHTML browsers. */
 .ohide {
     overflow: hidden;
-- 
2.11.0