sync with classic development and prepare 1.8 release

diff --git a/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css
index 5d9990fe0188457aa9334528495dd35670a35e8d..69af1ed2a8daf674b40be101ab2823b8de96eb7e 100644 (file)
--- a/EarlyBlue/communicator/communicator.css
+++ b/EarlyBlue/communicator/communicator.css
@@ -58,7 +58,7 @@
 #offline-status {
   list-style-image: url("chrome://communicator/skin/icons/online.gif");
 }
-  
+
 /* ::::: directional button icons ::::: */
 
 .up {
@@ -85,6 +85,24 @@
 }
 
 /* ::::: download manager ::::: */
+
 #downloadView > treechildren::-moz-tree-image(Name) {
   margin-right: 2px;
 }
+
+/* :::::: autoscroll popup ::::: */
+
+#autoscroller {
+  height: 28px;
+  width: 28px;
+  border: 0px;
+  margin: -14px;
+  padding: 0px;
+  background-image: url("chrome://communicator/skin/icons/autoscroll.gif");
+}
+#autoscroller[scrolldir="NS"] {
+  background-image: url("chrome://communicator/skin/icons/autoscroll-ns.gif");
+}
+#autoscroller[scrolldir="EW"] {
+  background-image: url("chrome://communicator/skin/icons/autoscroll-ew.gif");
+}

diff --git a/EarlyBlue/communicator/icons/autoscroll-ew.gif b/EarlyBlue/communicator/icons/autoscroll-ew.gif
new file mode 100644 (file)
index 0000000..05d252e
Binary files /dev/null and b/EarlyBlue/communicator/icons/autoscroll-ew.gif differ

diff --git a/EarlyBlue/communicator/icons/autoscroll-ns.gif b/EarlyBlue/communicator/icons/autoscroll-ns.gif
new file mode 100644 (file)
index 0000000..583cc51
Binary files /dev/null and b/EarlyBlue/communicator/icons/autoscroll-ns.gif differ

diff --git a/EarlyBlue/communicator/icons/autoscroll.gif b/EarlyBlue/communicator/icons/autoscroll.gif
new file mode 100644 (file)
index 0000000..7108e6c
Binary files /dev/null and b/EarlyBlue/communicator/icons/autoscroll.gif differ

diff --git a/EarlyBlue/contents.rdf b/EarlyBlue/contents.rdf
index 49adf393a892f59ee3cdb6391f9926dcde1b695f..ecef4a6f83743f2a6405afcf662b694e683d052d 100644 (file)
--- a/EarlyBlue/contents.rdf
+++ b/EarlyBlue/contents.rdf
@@ -5,42 +5,42 @@
 
   <!-- List all the skins being supplied by this theme -->
   <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a" />
+    <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8" />
   </RDF:Seq>
 
   <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8a"
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8"
         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.8a"
+        chrome:name="EarlyBlue/1.8"
         chrome:image="global/preview.png">
     <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:EarlyBlue/1.8a:packages">
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a:global"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a:communicator"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a:navigator"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a:messenger"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a:editor"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a:chatzilla"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a:inspector"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a:browser"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8a:mozapps"/>
+      <RDF:Seq about="urn:mozilla:skin:EarlyBlue/1.8:packages">
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8:global"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8:communicator"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8:navigator"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8:messenger"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8:editor"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8:chatzilla"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8:inspector"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8:browser"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/1.8:mozapps"/>
       </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.8a:global" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8a:communicator" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8a:navigator" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8a:messenger" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8a:editor" chrome:skinVersion="1.5"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8:global" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8:communicator" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8:navigator" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8:messenger" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8:editor" chrome:skinVersion="1.8"/>
 <!-- chatzilla hasn't set skinVersion currently
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8a:chatzilla" chrome:skinVersion="1.5"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8:chatzilla" chrome:skinVersion="1.8"/>
 -->
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8a:inspector" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8a:browser" chrome:skinVersion="1.5"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8a:mozapps" chrome:skinVersion="1.5"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8:inspector" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8:browser" chrome:skinVersion="1.8"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/1.8:mozapps" chrome:skinVersion="1.8"/>
 </RDF:RDF>

diff --git a/EarlyBlue/global/autocomplete.css b/EarlyBlue/global/autocomplete.css
index 7aac494519ff62a4e28d02cf136da8200f8b45aa..055fd9e1a3d372f97ebd904aae02a178098df50f 100644 (file)
--- a/EarlyBlue/global/autocomplete.css
+++ b/EarlyBlue/global/autocomplete.css
@@ -60,7 +60,7 @@ textbox {
   -moz-box-align: center;
   -moz-box-pack: center;
   min-width: 15px;
-  min-height: 19px; 
+  min-height: 19px;
   border: 1px outset #CCD0DD;
   background-color: #9999CC;
   padding: 1px;
@@ -82,7 +82,7 @@ textbox {
 }
 
 .autocomplete-history-popup {
-  max-height: 180px;
+  max-height: 25em;
 }
 
 /* ::::: tree ::::: */

diff --git a/EarlyBlue/global/browser.css b/EarlyBlue/global/browser.css
index ec2f181c9784b93f4968e7933dbb022690e62c61..c34ce0da22c772c0829d22af670a463493015ac3 100644 (file)
--- a/EarlyBlue/global/browser.css
+++ b/EarlyBlue/global/browser.css
@@ -92,4 +92,19 @@ tabbrowser > tabbox > tabpanels {
   margin-top: 2px;
   padding: 0px;
   list-style-image: url("chrome://global/skin/icons/tab-new.gif");
-}
\ No newline at end of file
+}
+
+.tab-drop-indicator-bar {
+  height: 11px;
+  margin-top: -11px;
+  margin-left: -8px;
+  position: relative;
+}
+
+.tab-drop-indicator {
+  height: 11px;
+  width: 11px;
+  margin-bottom: -8px;
+  position: relative;
+  list-style-image: url('chrome://global/skin/icons/tab-drag-indicator.gif');
+}

diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css
index 837d4df93535be54967610535c6f3f05a79cc674..18cc774a0690f0284bd86130896178b8774b1d8b 100644 (file)
--- a/EarlyBlue/global/global.css
+++ b/EarlyBlue/global/global.css
@@ -62,7 +62,7 @@ menulist > menupopup,
 }
 
 .menulist-compact {
-  -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact");
 }
 
 /*
@@ -166,3 +166,7 @@ resizer[dir="bottomright"] {
 .toolbar-focustarget {
   -moz-user-focus: ignore !important;
 }
+
+description.error {
+  color: #FF0000;
+}

diff --git a/EarlyBlue/global/globalBindings.xml b/EarlyBlue/global/globalBindings.xml
index 7449d8a9f915f854835858ac2e37a3c1924b8230..6036721e25a6e3c0595cb4c7439eea952ae51a02 100644 (file)
--- a/EarlyBlue/global/globalBindings.xml
+++ b/EarlyBlue/global/globalBindings.xml
@@ -39,4 +39,15 @@
     </content>
   </binding>
 
+  <binding id="menulist-compact" display="xul:menu"
+           extends="chrome://global/content/bindings/menulist.xml#menulist">
+    <content sizetopopup="false">
+      <xul:hbox class="menulist-label-box" flex="1">
+        <xul:image class="menulist-icon" xbl:inherits="src"/>
+        <xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey" crop="right" flex="1"/>
+      </xul:hbox>
+      <children includes="menupopup"/>
+    </content>
+  </binding>
+
 </bindings>
\ No newline at end of file

diff --git a/EarlyBlue/global/icons/tab-drag-indicator.gif b/EarlyBlue/global/icons/tab-drag-indicator.gif
new file mode 100644 (file)
index 0000000..bcd33c7
Binary files /dev/null and b/EarlyBlue/global/icons/tab-drag-indicator.gif differ

diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css
index 14c5aca76b978eabddd4ece719ab5718fa4e1d93..9997b950dc9170805b13977e0ae03a5e22e4a8d2 100644 (file)
--- a/EarlyBlue/global/menulist.css
+++ b/EarlyBlue/global/menulist.css
@@ -139,23 +139,16 @@ html|*.menulist-editable-input {
   border: 1px outset #CCD0DD;
 /*  background-color: -moz-Dialog;
   color: -moz-DialogText; */
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
 
-.menulist-compact > .menulist-label {
+.menulist-compact > .menulist-label-box > .menulist-label {
   margin: 0 3px !important;
   text-align: right;
 }
 
-.menulist-compact > .menulist-dropmarker {
+.menulist-compact > .menulist-label-box > .menulist-icon {
   margin-left: 2px;
-  border: none;
-  padding: 0 !important;
-  background: transparent;
-}
-
-menulist:hover:active > .menulist-dropmarker {
-  border: none;
-  padding: 0;
 }
 
 .menulist-compact[open="true"] {
@@ -164,3 +157,12 @@ menulist:hover:active > .menulist-dropmarker {
   color: ThreeDHighlight; */
 }
 
+.menulist-compact[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
+}
+
+.menulist-compact:focus > .menulist-label-box {
+  border: 1px dotted;
+  background-color: transparent;
+  color: inherit;
+}

diff --git a/EarlyBlue/global/netError.css b/EarlyBlue/global/netError.css
index 4ec2517cd0287e58d31bd4a665d229716b7017d4..533f04faf982988a9b9468dc4158a3200b87c1e1 100644 (file)
--- a/EarlyBlue/global/netError.css
+++ b/EarlyBlue/global/netError.css
@@ -64,6 +64,7 @@ body[dir="rtl"] #errorPageContainer {
 }
 
 #errorShortDesc > p {
+  overflow: auto;
   border-bottom: 1px solid #666699;
   padding-bottom: 1em;
   font-size: 130%;
@@ -98,3 +99,7 @@ body[dir="rtl"] #brand {
 #brand > p {
   margin: 0;
 }
+
+#errorContainer {
+  display: none;
+}

diff --git a/EarlyBlue/global/scrollbars.css b/EarlyBlue/global/scrollbars.css
index 742c823b3a019df9dcc2ff928b3ce7182b360a0b..92635b7659e764221a423baf850300d55f2767f0 100644 (file)
--- a/EarlyBlue/global/scrollbars.css
+++ b/EarlyBlue/global/scrollbars.css
@@ -109,6 +109,7 @@ scrollcorner {
   -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar-base");
   cursor: default;
   background-color: #999999;
+  width: 13px;
 }
 
 /* ..... increment .... */

diff --git a/EarlyBlue/global/splitter.css b/EarlyBlue/global/splitter.css
index dd534234486cd3afb10ea770eb8c864f63302697..702f2522ff90e3b1b86542b08f297534168fdcd3 100644 (file)
--- a/EarlyBlue/global/splitter.css
+++ b/EarlyBlue/global/splitter.css
@@ -46,7 +46,7 @@
 splitter {
   -moz-box-align: center;
   -moz-box-pack: center;
-  cursor: e-resize;
+  cursor: ew-resize;
   border: none;
   border-left: 1px solid #9999CC;
   border-right: 1px solid #9999CC;
@@ -62,7 +62,7 @@ splitter:hover:active {
 /* ::::: splitter (horizontal) ::::: */
 
 splitter[orient="vertical"] {
-  cursor: n-resize;
+  cursor: ns-resize;
   border: none;
   border-top: 1px solid #9999CC;
   border-bottom: 1px solid #9999CC;

diff --git a/EarlyBlue/messenger/filterDialog.css b/EarlyBlue/messenger/filterDialog.css
index 29ec572158b090bcd0019e812b63e7530ea4fae7..69b386ec064d396c5a71ec101d74c31c327880d9 100644 (file)
--- a/EarlyBlue/messenger/filterDialog.css
+++ b/EarlyBlue/messenger/filterDialog.css
@@ -81,5 +81,9 @@ textbox {
 }
 
 .ruleactionitem {
+  min-width: 20em;
+}
+
+.ruleaction-type {
   min-width: 15em;
 }

diff --git a/EarlyBlue/messenger/mailWindow1.css b/EarlyBlue/messenger/mailWindow1.css
index d212c6134fb2e05fec821749b8823615aa254e2d..d5642beab8a84255bac032c2ab4569422f5a05ca 100644 (file)
--- a/EarlyBlue/messenger/mailWindow1.css
+++ b/EarlyBlue/messenger/mailWindow1.css
@@ -13,7 +13,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
  *   Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
@@ -55,8 +55,22 @@
   height: 0px;
 }
 
+/* XXX bug 313731 buttons are taller than menulists */
+
+#msgLocationToolbar > #searchBox[collapsed="true"] {
+  visibility: hidden;
+}
+
+#locationIcon {
+  list-style-image: none;
+}
+
+#locationFolders {
+  width: 20em;
+}
+
 /* ..... tree adjustments ..... */
- 
+
 #folderTree {
   border: none;
   min-width: 1px;
@@ -66,3 +80,4 @@
   border: none;
   min-width: 1px;
 }
+

diff --git a/EarlyBlue/messenger/messengercompose/messengercompose.css b/EarlyBlue/messenger/messengercompose/messengercompose.css
index 12851ba53494730603b00c539c544d34cb4691fa..4aab5ee764cdc0c3149e57695aa391c162a65735 100644 (file)
--- a/EarlyBlue/messenger/messengercompose/messengercompose.css
+++ b/EarlyBlue/messenger/messengercompose/messengercompose.css
@@ -13,7 +13,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -23,7 +23,7 @@
  *   Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
@@ -45,14 +45,14 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: primary toolbar buttons ::::: */
- 
+
 #button-send {
   list-style-image: url("chrome://messenger/skin/messengercompose/send.gif");
 }
 
 #button-send[disabled="true"] {
   list-style-image: url("chrome://messenger/skin/messengercompose/send-disabled.gif") !important;
-} 
+}
 
 #button-send[offline="true"] {
   list-style-image: url("chrome://messenger/skin/messengercompose/sendlater.gif");
@@ -68,7 +68,7 @@
 
 #button-address[disabled="true"] {
   list-style-image: url("chrome://messenger/skin/messengercompose/address-disabled.gif") !important;
-} 
+}
 
 #button-attach {
   list-style-image: url("chrome://messenger/skin/messengercompose/attach.gif");
@@ -76,7 +76,7 @@
 
 #button-attach[disabled="true"] {
   list-style-image: url("chrome://messenger/skin/messengercompose/attach-disabled.gif") !important;
-} 
+}
 
 #button-quote {
   list-style-image: url("chrome://messenger/skin/messengercompose/quote.gif");
@@ -84,7 +84,7 @@
 
 #button-quote[disabled="true"] {
   list-style-image: url("chrome://messenger/skin/messengercompose/quote-disabled.gif") !important;
-} 
+}
 
 #spellingButton {
   list-style-image: url("chrome://editor/skin/icons/spell.gif");
@@ -100,7 +100,7 @@
 
 #button-save[disabled="true"] {
   list-style-image: url("chrome://messenger/skin/messengercompose/savemsg-disabled.gif") !important;
-} 
+}
 
 #button-stop {
   list-style-image: url("chrome://global/skin/icons/stop.gif");
@@ -108,7 +108,7 @@
 
 #button-stop[disabled="true"] {
   list-style-image: url("chrome://global/skin/icons/stop-disabled.gif") !important;
-} 
+}
 
 /* ::::: autocomplete icons ::::: */
 
@@ -132,15 +132,6 @@ treechildren::-moz-tree-image(remote-err) {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.gif");
 }
 
-.identity-popup-item {
-  -moz-binding: url("chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuitem");
-}
-
-.composemenu-text-2 {
-  font-style: italic;
-  color: #C0C0C0;
-}
-
 /* ::::: EarlyBlue layout corrections ::::: */
 
 #addresses-box,