keeping up with Classic trunk

diff --git a/EarlyBlue/communicator/bookmarks/bookmarksWindow.css b/EarlyBlue/communicator/bookmarks/bookmarksWindow.css
index d0fa1436a13ab30511f1afda87c47bda10692ab0..22e8372767a26d8210264cb337aa9ee4073fb33f 100644 (file)
--- a/EarlyBlue/communicator/bookmarks/bookmarksWindow.css
+++ b/EarlyBlue/communicator/bookmarks/bookmarksWindow.css
@@ -38,7 +38,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 @import url("chrome://communicator/skin/bookmarks/bookmarks.css");
  * ***** END LICENSE BLOCK ***** */
 
 @import url("chrome://communicator/skin/bookmarks/bookmarks.css");

-@import url("chrome://communicator/skin/bookmarks/platformBookmarks.css");

 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 


@@ -61,7 +60,8 @@
   list-style-image: url("chrome://communicator/skin/bookmarks/schedule.gif");
 }
 
   list-style-image: url("chrome://communicator/skin/bookmarks/schedule.gif");
 }
 

-#panel-bar {
+#panel-bar,
+#search-bar {

   border-top: 1px outset #CCD0DD;
   border-bottom: 1px outset #CCD0DD;
 }
   border-top: 1px outset #CCD0DD;
   border-bottom: 1px outset #CCD0DD;
 }

diff --git a/EarlyBlue/contents.rdf b/EarlyBlue/contents.rdf
index 26c35cc574eb2168397bbc2134c25221934c6ee6..27d54d920857fc0b05fb38d33ca784fd9870f46e 100644 (file)
--- a/EarlyBlue/contents.rdf
+++ b/EarlyBlue/contents.rdf
@@ -5,38 +5,40 @@
 
   <!-- List all the skins being supplied by this theme -->
   <RDF:Seq about="urn:mozilla:skin:root">
 
   <!-- List all the skins being supplied by this theme -->
   <RDF:Seq about="urn:mozilla:skin:root">

-    <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.1" />
+    <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.2" />

   </RDF:Seq>
 
   <!-- classic Information -->
   </RDF:Seq>
 
   <!-- classic Information -->

-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.1"
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.2"

         chrome:displayName="EarlyBlue"
         chrome:accessKey="E"
         chrome:author="Robert Kaiser - KaiRo.at"
         chrome:description="This theme re-introduces a UI design idea based on early Mozilla milestones. Get more info at http://www.kairo.at/download/"
         chrome:displayName="EarlyBlue"
         chrome:accessKey="E"
         chrome:author="Robert Kaiser - KaiRo.at"
         chrome:description="This theme re-introduces a UI design idea based on early Mozilla milestones. Get more info at http://www.kairo.at/download/"

-        chrome:name="EarlyBlue/1.1"
+        chrome:name="EarlyBlue/1.2"

         chrome:image="global/preview.png">
     <chrome:packages>
         chrome:image="global/preview.png">
     <chrome:packages>

-      <RDF:Seq about="urn:mozilla:skin:EarlyBlue/1.1:packages">
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.1:global"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.1:communicator"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.1:navigator"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.1:messenger"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.1:editor"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.1:chatzilla"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.1:inspector"/>
+      <RDF:Seq about="urn:mozilla:skin:EarlyBlue/1.2:packages">
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.2:global"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.2:communicator"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.2:navigator"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.2:messenger"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.2:editor"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.2:chatzilla"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.2:inspector"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.2:browser"/>

       </RDF:Seq>
     </chrome:packages>
   </RDF:Description>
 
   <!-- Version Information.  State that we work only with a certain version of this package. -->
       </RDF:Seq>
     </chrome:packages>
   </RDF:Description>
 
   <!-- Version Information.  State that we work only with a certain version of this package. -->

-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.1:global" chrome:skinVersion="1.2"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.1:communicator" chrome:skinVersion="1.2"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.1:navigator" chrome:skinVersion="1.2"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.1:messenger" chrome:skinVersion="1.2"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.1:editor" chrome:skinVersion="1.2"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.2:global" chrome:skinVersion="1.2"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.2:communicator" chrome:skinVersion="1.2"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.2:navigator" chrome:skinVersion="1.2"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.2:messenger" chrome:skinVersion="1.2"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.2:editor" chrome:skinVersion="1.2"/>

 <!-- chatzilla hasn't set skinVersion currently
 <!-- chatzilla hasn't set skinVersion currently

-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.1:chatzilla" chrome:skinVersion="1.2"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.2:chatzilla" chrome:skinVersion="1.2"/>

 -->
 -->

-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.1:inspector" chrome:skinVersion="1.2"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.2:inspector" chrome:skinVersion="1.2"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.2:browser" chrome:skinVersion="1.2"/>

 </RDF:RDF>
 </RDF:RDF>

diff --git a/EarlyBlue/messenger/addressbook/addressbook.css b/EarlyBlue/messenger/addressbook/addressbook.css
index 4cb7be0a10e84d5f2446f0b1bdf5e270f07e0a1c..1cae727b96c0dc7571381c81e35cd1cb5b0c0de8 100644 (file)
--- a/EarlyBlue/messenger/addressbook/addressbook.css
+++ b/EarlyBlue/messenger/addressbook/addressbook.css
@@ -79,11 +79,11 @@
 } 
 
 #button-newim {
 } 
 
 #button-newim {

-  list-style-image:url("chrome://messenger/skin/addressbook/icons/newmsg.gif");
+  list-style-image:url("chrome://messenger/skin/addressbook/icons/im.gif");

 }
 
 #button-newim[disabled="true"] {
 }
 
 #button-newim[disabled="true"] {

-  list-style-image: url("chrome://messenger/skin/addressbook/icons/newmsg-disabled.gif") !important;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/im-disabled.gif") !important;

 } 
 
 #button-delete {
 } 
 
 #button-delete {

diff --git a/EarlyBlue/messenger/addressbook/icons/im-disabled.gif b/EarlyBlue/messenger/addressbook/icons/im-disabled.gif
new file mode 100644 (file)
index 0000000..f22078e
Binary files /dev/null and b/EarlyBlue/messenger/addressbook/icons/im-disabled.gif differ

diff --git a/EarlyBlue/messenger/addressbook/icons/im.gif b/EarlyBlue/messenger/addressbook/icons/im.gif
new file mode 100644 (file)
index 0000000..f638395
Binary files /dev/null and b/EarlyBlue/messenger/addressbook/icons/im.gif differ

diff --git a/EarlyBlue/messenger/folderPane.css b/EarlyBlue/messenger/folderPane.css
index 8bc788a4e75051ca08d46d6c17c0dedfca08f868..a269fc596c4a095ddb57ef4d0e41cd2b1ce24a79 100644 (file)
--- a/EarlyBlue/messenger/folderPane.css
+++ b/EarlyBlue/messenger/folderPane.css
@@ -198,6 +198,7 @@ treechildren:-moz-tree-image(syncCol, isServer-true) {
 }
 
 #folderUnreadCol,
 }
 
 #folderUnreadCol,

-#folderTotalCol {
+#folderTotalCol,
+#folderSizeCol {

   text-align: right;
 }
   text-align: right;
 }

diff --git a/EarlyBlue/messenger/icons/message-junk-other.gif b/EarlyBlue/messenger/icons/message-junk-other.gif
new file mode 100644 (file)
index 0000000..0fd4a39
Binary files /dev/null and b/EarlyBlue/messenger/icons/message-junk-other.gif differ

diff --git a/EarlyBlue/messenger/icons/message-mail-imapdelete.gif b/EarlyBlue/messenger/icons/message-mail-imapdelete.gif
index ab6a05e30f1793a799f39ab19f4a0c1a6f62b792..7fac196322c1f83065505f4e8a49ab85ff487e2e 100755 (executable)
Binary files a/EarlyBlue/messenger/icons/message-mail-imapdelete.gif and b/EarlyBlue/messenger/icons/message-mail-imapdelete.gif differ

diff --git a/EarlyBlue/messenger/primaryToolbar.css b/EarlyBlue/messenger/primaryToolbar.css
index 91da14c45b879062c23c9cad37d335bfc8628cee..c7d0736f309d8e919e16cf3e7b09c59ebbd8fe5b 100644 (file)
--- a/EarlyBlue/messenger/primaryToolbar.css
+++ b/EarlyBlue/messenger/primaryToolbar.css
@@ -132,9 +132,9 @@
 }
 
 #button-junk {
 }
 
 #button-junk {

-  list-style-image: url("chrome://messenger/skin/toolbar/mark.gif");
+  list-style-image: url("chrome://messenger/skin/toolbar/junk.gif");

 }
 
 #button-junk[disabled="true"] {
 }
 
 #button-junk[disabled="true"] {

-  list-style-image: url("chrome://messenger/skin/toolbar/mark-disabled.gif") !important;
+  list-style-image: url("chrome://messenger/skin/toolbar/junk-disabled.gif") !important;

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/EarlyBlue/messenger/threadPane.css b/EarlyBlue/messenger/threadPane.css
index 779530a875937fdf1ebc70e3500d16421be78ae0..b7f15965f1b605a77106ee835e36a0fe587dc57d 100644 (file)
--- a/EarlyBlue/messenger/threadPane.css
+++ b/EarlyBlue/messenger/threadPane.css
@@ -168,6 +168,25 @@ treechildren:-moz-tree-image(flaggedCol, flagged) {
   list-style-image: url("chrome://messenger/skin/icons/flaggedmail.gif");
 }
 
   list-style-image: url("chrome://messenger/skin/icons/flaggedmail.gif");
 }
 

+/* ..... junkStatus column ..... */
+
+treecol.junkStatusHeader {
+  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
+}
+
+/* "unknown" now looks like "not junk".  see bug #182386 */
+treechildren:-moz-tree-image(junkStatusCol) {
+  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+}
+
+treechildren:-moz-tree-image(junkStatusCol, junk) {
+  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
+}
+
+treechildren:-moz-tree-image(junkStatusCol, notjunk) {
+  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
+}
+

 /* ..... subject column ..... */
 
 treechildren:-moz-tree-image(subjectCol) {
 /* ..... subject column ..... */
 
 treechildren:-moz-tree-image(subjectCol) {

diff --git a/EarlyBlue/messenger/toolbar/junk-disabled.gif b/EarlyBlue/messenger/toolbar/junk-disabled.gif
new file mode 100644 (file)
index 0000000..cc6fac5
Binary files /dev/null and b/EarlyBlue/messenger/toolbar/junk-disabled.gif differ

diff --git a/EarlyBlue/messenger/toolbar/junk.gif b/EarlyBlue/messenger/toolbar/junk.gif
new file mode 100644 (file)
index 0000000..6b3794a
Binary files /dev/null and b/EarlyBlue/messenger/toolbar/junk.gif differ