More CSS cleanups

diff --git a/imp/templates/chunks/message.php b/imp/templates/chunks/message.php
index 22f743e..2aa7d15 100644 (file)
--- a/imp/templates/chunks/message.php
+++ b/imp/templates/chunks/message.php
@@ -51,7 +51,7 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
      <div class="dimpOptions noprint">
       <div id="msg_print"><?php echo IMP::img('print.png', '', '', $horde_img) ?><a><?php echo _("Print") ?></a></div>
 <?php if (!empty($conf['user']['allow_view_source'])): ?>
-      <div id="msg_view_source"><span class="iconImg msgsourceImg"></span><a><?php echo _("View Message Source") ?></a></div>
+      <div id="msg_view_source"><span class="iconImg"></span><a><?php echo _("View Message Source") ?></a></div>
 <?php endif; ?>
      </div>
      <div id="msgHeadersContent">
@@ -69,7 +69,7 @@ function _createDAfmsg($text, $image, $id, $class = '', $show_text = true)
 <?php endforeach; ?>
 <?php if (isset($show_msg_result['atc_label'])): ?>
         <tr id="msgAtc">
-         <td class="label"><?php if ($show_msg_result['atc_list']): ?><a id="partlist_toggle"><span id="partlist_col" class="iconImg arrowcollapsedImg"></span><span id="partlist_exp" class="iconImg arrowexpandedImg" style="display:none"></span> <span class="iconImg attachmentImg attachmentImage"></span></a><?php else: ?><span class="iconImg attachmentImg attachmentImage"></span><?php endif; ?></td>
+         <td class="label"><?php if ($show_msg_result['atc_list']): ?><a id="partlist_toggle"><span id="partlist_col" class="iconImg"></span><span id="partlist_exp" class="iconImg" style="display:none"></span> <span class="iconImg attachmentImg attachmentImage"></span></a><?php else: ?><span class="iconImg attachmentImg attachmentImage"></span><?php endif; ?></td>
          <td>
           <span class="atcLabel"><?php echo $show_msg_result['atc_label'] ?></span><?php echo $show_msg_result['atc_download'] ?>
 <?php if (isset($show_msg_result['atc_list'])): ?>

diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index 6b2c3c4..887fda2 100644 (file)
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -153,14 +153,14 @@ function _simpleButton($id, $text, $image, $imagedir = null)
 <?php endforeach; ?>
 <?php if ($show_quota): ?>
         <li id="quota">
-         <span class="used"><span class="iconImg quotaImg"></span></span>
+         <span class="used"><span class="iconImg"></span></span>
         </li>
 <?php endif; ?>
        </ul>
       </div>
 <?php elseif ($show_quota): ?>
       <div id="quota">
-       <span class="used"><span class="iconImg quotaImg"></span></span>
+       <span class="used"><span class="iconImg"></span></span>
       </div>
 <?php endif; ?>
      </div>
@@ -274,22 +274,22 @@ function _simpleButton($id, $text, $image, $imagedir = null)
       <div id="previewMsg" style="display:none">
        <div class="msgHeaders">
         <div id="toggleHeaders" class="noprint">
-         <a id="th_expand"><span class="iconImg arrowcollapsedImg" title="<?php echo htmlspecialchars(_("Expand Headers")) ?>"></span></a>
-         <a id="th_collapse" style="display:none"><span class="iconImg arrowexpandedImg" title="<?php echo htmlspecialchars(_("Collapse Headers")) ?>"></span></a>
+         <a id="th_expand"><span class="iconImg" title="<?php echo htmlspecialchars(_("Expand Headers")) ?>"></span></a>
+         <a id="th_collapse" style="display:none"><span class="iconImg" title="<?php echo htmlspecialchars(_("Collapse Headers")) ?>"></span></a>
          <span class="iconImg attachmentImg" style="display:none"></span>
         </div>
         <div id="msgHeadersColl">
-         <a id="msg_newwin"><span class="iconImg newwinImg newwinCollapsed" title="<?php echo htmlspecialchars(_("Open in new window")) ?>"></span></a>
+         <a id="msg_newwin"><span class="iconImg" title="<?php echo htmlspecialchars(_("Open in new window")) ?>"></span></a>
          <span class="date"></span>
          <span class="subject"></span>
          <span class="fromcontainer"><?php echo _("from") ?> <span class="from"></span></span>
         </div>
         <div id="msgHeaders" style="display:none">
          <div class="dimpOptions noprint">
-          <div id="msg_newwin_options"><span class="iconImg newwinImg"></span><a><?php echo _("Open in new window") ?></a></div>
+          <div id="msg_newwin_options"><span class="iconImg"></span><a><?php echo _("Open in new window") ?></a></div>
           <div id="msg_print"><?php echo IMP::img('print.png', '', '', $hordeimg) ?><a><?php echo _("Print") ?></a></div>
 <?php if (!empty($conf['user']['allow_view_source'])): ?>
-          <div id="msg_view_source"><span class="iconImg msgsourceImg"></span><a><?php echo _("View Message Source") ?></a></div>
+          <div id="msg_view_source"><span class="iconImg"></span><a><?php echo _("View Message Source") ?></a></div>
 <?php endif; ?>
          </div>
          <div id="msgHeadersContent">
@@ -316,7 +316,7 @@ function _simpleButton($id, $text, $image, $imagedir = null)
              <td class="cc"></td>
             </tr>
             <tr id="msgAtc" style="display:none">
-             <td class="label"><span class="iconImg attachmentImg attachmentImage"></span><a id="partlist_toggle"><span class="iconImg arrowcollapsedImg" id="partlist_col"></span><span class="iconImg arrowexpandedImg" id="partlist_exp" style="display:none"></span></a></td>
+             <td class="label"><span class="iconImg attachmentImg attachmentImage"></span><a id="partlist_toggle"><span class="iconImg" id="partlist_col"></span><span class="iconImg" id="partlist_exp" style="display:none"></span></a></td>
              <td>
               <div></div>
               <div id="partlist" style="display:none">

diff --git a/imp/themes/graphics/arrow_collapsed.png b/imp/themes/graphics/arrow_collapsed.png
index 25e8231..9f7238c 100644 (file)
Binary files a/imp/themes/graphics/arrow_collapsed.png and b/imp/themes/graphics/arrow_collapsed.png differ

diff --git a/imp/themes/graphics/arrow_expanded.png b/imp/themes/graphics/arrow_expanded.png
index da16388..e64e581 100644 (file)
Binary files a/imp/themes/graphics/arrow_expanded.png and b/imp/themes/graphics/arrow_expanded.png differ

diff --git a/imp/themes/graphics/popdown.png b/imp/themes/graphics/popdown.png
index dd2b133..1a80604 100644 (file)
Binary files a/imp/themes/graphics/popdown.png and b/imp/themes/graphics/popdown.png differ

diff --git a/imp/themes/graphics/popright.png b/imp/themes/graphics/popright.png
index 9aac6c1..f8617c2 100644 (file)
Binary files a/imp/themes/graphics/popright.png and b/imp/themes/graphics/popright.png differ

diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 33e6547..50c4d02 100644 (file)
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -772,8 +772,11 @@ div.dimpActionsCompose, div.dimpActionsMsg {
     border: 1px solid #ccc;
     font-weight: bold;
 }
+#attach_list div, span.attachmentImg {
+    background-image: url("graphics/attachment.png");
+}
 #attach_list div {
-    background: transparent url("graphics/attachment.png") left 2px no-repeat;
+    background: transparent left 2px no-repeat;
     height: 20px;
     padding-left: 20px;
 }
@@ -813,9 +816,9 @@ span.attachName:hover {
 }
 .context a span.contextExpand {
     float: right;
-    margin-top: 2px;
-    width: 4px;
-    height: 9px;
+    width: 16px;
+    height: 16px;
+    margin-top: -1px;
     background: url("graphics/popright.png") no-repeat;
 }
 .context div.sep {
@@ -1115,38 +1118,36 @@ span.iconImg, span.contextImg, span.spellcheckPopdownImg {
 }
 
 /* Other images */
-span.newwinImg {
+#msg_newwin span.iconImg, #msg_newwin_options span.iconImg {
     background-image: url("graphics/newwin.png");
 }
-span.newwinCollapsed {
+#msg_newwin span.iconImg {
     float: right;
     margin-left: 4px;
     margin-right: 0px;
 }
-span.quotaImg {
+#quota span.iconImg {
     background-image: url("graphics/quotauncover.gif");
     width: 0px;
     margin-right: 0px;
 }
-span.keyupImg {
-    background-image: url("graphics/key_up.png");
-}
-span.keydownImg {
-    background-image: url("graphics/key_down.png");
-}
-span.arrowcollapsedImg {
+#th_expand span.iconImg, #partlist_col {
     background-image: url("graphics/arrow_collapsed.png");
 }
-span.arrowexpandedImg {
+#th_collapse span.iconImg, #partlist_exp {
     background-image: url("graphics/arrow_expanded.png");
 }
-span.attachmentImg {
-    background-image: url("graphics/attachment.png");
-}
-span.msgsourceImg {
+#msg_view_source span.iconImg {
     background-image: url("graphics/message_source.png");
 }
+
 span.popdownImg, span.spellcheckPopdownImg {
     background-image: url("graphics/popdown.png");
     margin-right: 0px;
 }
+span.keyupImg {
+    background-image: url("graphics/key_up.png");
+}
+span.keydownImg {
+    background-image: url("graphics/key_down.png");
+}

diff --git a/imp/themes/screen.css b/imp/themes/screen.css
index 5c6ba5c..6c78d5e 100644 (file)
--- a/imp/themes/screen.css
+++ b/imp/themes/screen.css
@@ -64,7 +64,8 @@ ul.msgactions, ul.msgactions ul {
     border-right: 0;
 }
 .msgactions a.hasmenu {
-    padding-right: 11px;
+    padding-right: 15px;
+    margin-right: -3px;
     background: url("graphics/popdown.png") no-repeat center right;
 }
 .msgactions li a {

diff --git a/imp/themes/silver/screen-dimp.css b/imp/themes/silver/screen-dimp.css
index 30362f4..6798ffe 100644 (file)
--- a/imp/themes/silver/screen-dimp.css
+++ b/imp/themes/silver/screen-dimp.css
@@ -1,22 +1,10 @@
 /* Background images. */
-.msglist div.statusUnseen {
-    background-image: url("graphics/mail_unseen.png");
-}
-.msglist div.statusFlagged {
-    background-image: url("graphics/mail_flagged.png");
-}
 .msglist div.statusDeleted {
     background-image: url("graphics/mail_deleted.png");
 }
-.msglist div.statusAnswered {
-    background-image: url("graphics/mail_answered.png");
-}
-.msglist div.statusForwarded {
+.msglist div.statusForwarded, #alerts div.imp-forward, #alerts div.imp-redirect {
     background-image: url("graphics/mail_forwarded.png");
 }
-.msglist div.statusDraft {
-    background-image: url("graphics/mail_draft.png");
-}
 .msglist div.lowPriority {
     background-image: url("graphics/mail_priority_low.png");
 }
@@ -51,7 +39,7 @@
 #sidebarPanel .trash {
     background-image: url("graphics/folder_trash.png");
 }
-#attach_list div {
+#attach_list div, span.attachmentImg {
     background-image: url("graphics/attachment.png");
 }
 #alerts div.horde-error {
@@ -66,12 +54,6 @@
 #alerts div.horde-warning, #alerts div.dimp-sticky, #alerts div.dimp-sticky {
     background-image: url("graphics/warning.png");
 }
-#alerts div.imp-reply {
-    background-image: url("graphics/mail_answered.png");
-}
-#alerts div.imp-forward, #alerts div.imp-redirect {
-    background-image: url("graphics/mail_forwarded.png");
-}
 
 .header {
     border-left: 1px solid #999;
@@ -87,10 +69,7 @@
 }
 
 .context a span.contextExpand {
-    width: 16px;
-    height: 16px;
     background-image: url("graphics/popright.png");
-    margin-top: -1px;
 }
 
 /* Context menu images */
@@ -112,30 +91,27 @@
 #flag_seen span.contextImg, #ctx_folder_seen span.contextImg {
     background-image: url("graphics/mail_seen.png");
 }
-#flag_unseen span.contextImg, #ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
+.msglist div.statusUnseen, #flag_unseen span.contextImg, #ctx_folder_unseen span.contextImg, #ctx_folder_poll span.contextImg, #ctx_folder_nopoll span.contextImg {
     background-image: url("graphics/mail_unseen.png");
 }
-#ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg, #flag_flagged span.contextImg {
+.msglist div.statusFlagged, #ctx_message_setflag span.contextImg, #ctx_draft_setflag span.contextImg, #oa_setflag span.contextImg, #flag_flagged span.contextImg {
     background-image: url("graphics/mail_flagged.png");
 }
 #flag_clear span.contextImg {
     background-image: url("graphics/mail_clearflag.png");
 }
-#flag_answered span.contextImg {
+.msglist div.statusAnswered, #alerts div.imp-reply, #flag_answered span.contextImg {
     background-image: url("graphics/mail_answered.png");
 }
 #flag_unanswered span.contextImg {
     background-image: url("graphics/mail_notanswered.png");
 }
-#flag_draft span.contextImg {
+.msglist div.statusDraft, #flag_draft span.contextImg, #ctx_draft_resume span.contextImg {
     background-image: url("graphics/mail_draft.png");
 }
 #flag_notdraft span.contextImg {
     background-image: url("graphics/mail_notdraft.png");
 }
-#ctx_draft_resume span.contextImg {
-    background-image: url("graphics/mail_draft.png");
-}
 #previewtoggle span.contextImg {
     background-image: url("graphics/preview.png");
 }
@@ -165,30 +141,28 @@
 }
 
 /* Other images */
-span.newwinImg {
+#msg_newwin span.iconImg, #msg_newwin_options span.iconImg {
     background-image: url("graphics/newwin.png");
 }
-span.quotaImg {
+#quota span.iconImg {
     background-image: url("graphics/quotauncover.gif");
 }
-span.keyupImg {
-    background-image: url("graphics/key_up.png");
-}
-span.keydownImg {
-    background-image: url("graphics/key_down.png");
-}
-span.arrowcollapsedImg {
+#th_expand span.iconImg, #partlist_col {
     background-image: url("graphics/arrow_collapsed.png");
 }
-span.arrowexpandedImg {
+#th_collapse span.iconImg, #partlist_exp {
     background-image: url("graphics/arrow_expanded.png");
 }
-span.attachmentImg {
-    background-image: url("graphics/attachment.png");
-}
-span.msgsourceImg {
+#msg_view_source span.iconImg {
     background-image: url("graphics/message_source.png");
 }
+
 span.popdownImg, span.spellcheckPopdownImg {
     background-image: url("graphics/popdown.png");
 }
+span.keyupImg {
+    background-image: url("graphics/key_up.png");
+}
+span.keydownImg {
+    background-image: url("graphics/key_down.png");
+}