diff --git a/mozilla/themes/modern/jar.mn b/mozilla/themes/modern/jar.mn index 7cf203e534d..01a48c6cc6b 100644 --- a/mozilla/themes/modern/jar.mn +++ b/mozilla/themes/modern/jar.mn @@ -381,8 +381,16 @@ modern.jar: skin/modern/messenger/icons/thread-new-closed-kill.gif (messenger/icons/thread-new-closed-kill.gif) skin/modern/messenger/icons/thread-new-closed-offl-eye.gif (messenger/icons/thread-new-closed-offl-eye.gif) skin/modern/messenger/icons/thread-new-closed-offl-kill.gif (messenger/icons/thread-new-closed-offl-kill.gif) - skin/modern/messenger/icons/new-mail-alert.png (messenger/icons/new-mail-alert.png) + skin/modern/messenger/icons/new-mail-alert.png (messenger/icons/new-mail-alert.png) skin/modern/messenger/icons/btn1.gif (messenger/icons/btn1.gif) + skin/modern/messenger/icons/junk.gif (messenger/icons/junk.gif) + skin/modern/messenger/icons/junk-act.gif (messenger/icons/junk-act.gif) + skin/modern/messenger/icons/junk-hov.gif (messenger/icons/junk-hov.gif) + skin/modern/messenger/icons/junk-dis.gif (messenger/icons/junk-dis.gif) + skin/modern/messenger/icons/message-junk-junk.gif (messenger/icons/message-junk-junk.gif) + skin/modern/messenger/icons/message-junk-other.gif (messenger/icons/message-junk-other.gif) + skin/modern/messenger/icons/message-junk-notjunk.gif (messenger/icons/message-junk-notjunk.gif) + skin/modern/messenger/icons/message-junk-unknown.gif (messenger/icons/message-junk-unknown.gif) skin/modern/messenger/messengercompose/messengercompose.css (messenger/messengercompose/messengercompose.css) skin/modern/messenger/messengercompose/icons/mast-msgcomp.gif (messenger/messengercompose/icons/mast-msgcomp.gif) skin/modern/messenger/smime/msgReadSecurityInfo.css (messenger/smime/msgReadSecurityInfo.css) diff --git a/mozilla/themes/modern/messenger/icons/junk-act.gif b/mozilla/themes/modern/messenger/icons/junk-act.gif new file mode 100644 index 00000000000..19cc3e4d299 Binary files /dev/null and b/mozilla/themes/modern/messenger/icons/junk-act.gif differ diff --git a/mozilla/themes/modern/messenger/icons/junk-dis.gif b/mozilla/themes/modern/messenger/icons/junk-dis.gif new file mode 100644 index 00000000000..c3c4762994c Binary files /dev/null and b/mozilla/themes/modern/messenger/icons/junk-dis.gif differ diff --git a/mozilla/themes/modern/messenger/icons/junk-hov.gif b/mozilla/themes/modern/messenger/icons/junk-hov.gif new file mode 100644 index 00000000000..448a964081f Binary files /dev/null and b/mozilla/themes/modern/messenger/icons/junk-hov.gif differ diff --git a/mozilla/themes/modern/messenger/icons/junk.gif b/mozilla/themes/modern/messenger/icons/junk.gif new file mode 100644 index 00000000000..fee7cf91fa6 Binary files /dev/null and b/mozilla/themes/modern/messenger/icons/junk.gif differ diff --git a/mozilla/themes/modern/messenger/icons/message-junk-junk.gif b/mozilla/themes/modern/messenger/icons/message-junk-junk.gif new file mode 100644 index 00000000000..cf9b7189972 Binary files /dev/null and b/mozilla/themes/modern/messenger/icons/message-junk-junk.gif differ diff --git a/mozilla/themes/modern/messenger/icons/message-junk-notjunk.gif b/mozilla/themes/modern/messenger/icons/message-junk-notjunk.gif new file mode 100644 index 00000000000..7cd6bb69b4e Binary files /dev/null and b/mozilla/themes/modern/messenger/icons/message-junk-notjunk.gif differ diff --git a/mozilla/themes/modern/messenger/icons/message-junk-other.gif b/mozilla/themes/modern/messenger/icons/message-junk-other.gif new file mode 100644 index 00000000000..5dad5d8493e Binary files /dev/null and b/mozilla/themes/modern/messenger/icons/message-junk-other.gif differ diff --git a/mozilla/themes/modern/messenger/icons/message-junk-unknown.gif b/mozilla/themes/modern/messenger/icons/message-junk-unknown.gif new file mode 100644 index 00000000000..6d6f165f366 Binary files /dev/null and b/mozilla/themes/modern/messenger/icons/message-junk-unknown.gif differ diff --git a/mozilla/themes/modern/messenger/primaryToolbar.css b/mozilla/themes/modern/messenger/primaryToolbar.css index 95809a13130..88c00887ada 100644 --- a/mozilla/themes/modern/messenger/primaryToolbar.css +++ b/mozilla/themes/modern/messenger/primaryToolbar.css @@ -232,18 +232,19 @@ -moz-image-region: rect(68px 199px 101px 150px) !important; } -#button-junk { - -moz-image-region: rect(136px 49px 169px 0); +#button-junk{ + list-style-image: url("chrome://messenger/skin/icons/junk.gif"); } -#button-junk[buttonover] { - -moz-image-region: rect(136px 99px 169px 50px); +#button-junk:hover { + list-style-image: url("chrome://messenger/skin/icons/junk-hov.gif"); } -#button-junk[buttondown] { - -moz-image-region: rect(136px 149px 169px 100px); -} +#button-junk:hover:active { + list-style-image: url("chrome://messenger/skin/icons/junk-act.gif"); +} + +#button-junk[disabled="true"] { + list-style-image: url("chrome://messenger/skin/icons/junk-dis.gif"); +} -#button-junk[disabled] { - -moz-image-region: rect(136px 199px 169px 150px) !important; -} \ No newline at end of file diff --git a/mozilla/themes/modern/messenger/threadPane.css b/mozilla/themes/modern/messenger/threadPane.css index e9b43f9f384..73c85d9ac06 100644 --- a/mozilla/themes/modern/messenger/threadPane.css +++ b/mozilla/themes/modern/messenger/threadPane.css @@ -181,6 +181,24 @@ treechildren:-moz-tree-image(flaggedCol, flagged) { list-style-image: url("chrome://messenger/skin/icons/flagcol-flagged.gif"); } +/* ..... junkStatus column ..... */ + +treecol.junkStatusHeader { + list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif"); +} + +treechildren:-moz-tree-image(junkStatusCol) { + list-style-image: url("chrome://messenger/skin/icons/message-junk-unknown.gif"); +} + +treechildren:-moz-tree-image(junkStatusCol, junk) { + list-style-image: url("chrome://messenger/skin/icons/message-junk-junk.gif"); +} + +treechildren:-moz-tree-image(junkStatusCol, notjunk) { + list-style-image: url("chrome://messenger/skin/icons/message-junk-notjunk.gif"); +} + /* ..... subject column ..... */ treechildren:-moz-tree-image(subjectCol) {