keep up with trunk development

diff --git a/EarlyBlue/communicator/alerts/alert.css b/EarlyBlue/communicator/alerts/alert.css
index cb7b33943a2b93f12d058afae5c27ec054826ae0..a9382b2227d72eecd1729a655c96a74f37084b5c 100644 (file)
--- a/EarlyBlue/communicator/alerts/alert.css
+++ b/EarlyBlue/communicator/alerts/alert.css
@@ -53,18 +53,24 @@
   min-height: 50px;
 }
 
-.alertImageBox {
-  margin-left: 4px;
-  margin-right: 6px;
+.alertBox[orient="horizontal"] > .alertImageBox {
+  -moz-margin-start: 4px;
+  -moz-margin-end: 6px;
   min-height: 46px;
 }
 
+.alertBox[orient="vertical"] > .alertImageBox {
+  margin-top: 6px;
+  margin-bottom: 4px;
+  min-width: 46px;
+}
+
 .alertTitle {
   font-weight: bold;
 }
 
 .alertText {
-  margin-right: 6px;
+  -moz-margin-end: 6px;
 }
 
 .alertText[clickable="true"] {
@@ -77,7 +83,14 @@
   color: #424F63;
 }
 
-.alertTextBox {
-  padding-right: 10px;
+.alertBox[orient="horizontal"] > .alertTextBox {
+  -moz-padding-start: 10px;
   padding-top: 5px;
 }
+
+.alertBox[orient="vertical"] > .alertTextBox {
+  -moz-padding-start: 5px;
+  -moz-padding-end: 5px;
+  margin-bottom: 8px;
+  -moz-box-align: center; /* also hard-coded in alert.js, see bug 311557 */
+}

diff --git a/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css
index e08ac8b64ea8996baab284ed44957e5b9efb3a09..4d94de3f7610d4b2cd269edb4840601dd239267c 100644 (file)
--- a/EarlyBlue/communicator/communicator.css
+++ b/EarlyBlue/communicator/communicator.css
@@ -103,11 +103,39 @@
   border: 0px;
   margin: -14px;
   padding: 0px;
-  background-image: url("chrome://communicator/skin/icons/autoscroll.gif");
+  background-image: url("chrome://communicator/skin/icons/autoscroll.png");
+  background-color: transparent;
+  -moz-appearance: none;
 }
+
 #autoscroller[scrolldir="NS"] {
-  background-image: url("chrome://communicator/skin/icons/autoscroll-ns.gif");
+  background-position: left center;
 }
+
 #autoscroller[scrolldir="EW"] {
-  background-image: url("chrome://communicator/skin/icons/autoscroll-ew.gif");
+  background-position: left bottom;
+}
+
+#autoscroller[transparent="true"] {
+  background-position: center top;
+}
+
+#autoscroller[transparent="true"][scrolldir="NS"] {
+  background-position: center center;
+}
+
+#autoscroller[transparent="true"][scrolldir="EW"] {
+  background-position: center bottom;
+}
+
+#autoscroller[translucent="true"] {
+  background-position: right top;
+}
+
+#autoscroller[translucent="true"][scrolldir="NS"] {
+  background-position: right center;
+}
+
+#autoscroller[translucent="true"][scrolldir="EW"] {
+  background-position: right bottom;
 }

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

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

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

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

diff --git a/EarlyBlue/communicator/smileys.css b/EarlyBlue/communicator/smileys.css
index 3db9ecf94f2cb7e25420f5ad2a9701f829e6ada5..40d55654c7ffc01c52f188279cad87e1ae502fd1 100644 (file)
--- a/EarlyBlue/communicator/smileys.css
+++ b/EarlyBlue/communicator/smileys.css
@@ -124,7 +124,7 @@ span.moz-smiley-s7 {
   background-image: url("chrome://communicator/skin/icons/smileys/undecided_n.gif");
 }
 
-/* suprise */
+/* surprise */
 span.moz-smiley-s8 {
   background-image: url("chrome://communicator/skin/icons/smileys/surprise_n.gif");
 }

diff --git a/EarlyBlue/global/menu.css b/EarlyBlue/global/menu.css
index 3f1fede5c2b87e18f645cdc817b2b43956e54b9a..6476aeab4a63ad8dc4c474b0be0b6a751bc2fb28 100644 (file)
--- a/EarlyBlue/global/menu.css
+++ b/EarlyBlue/global/menu.css
@@ -183,28 +183,28 @@ menuitem[checked="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-check.gif");
 }
 
-menuitem[checked="true"][disabled="true"] {
-  list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
-}
-
 menuitem[checked="true"][_moz-menuactive="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-check-hover.gif");
 }
 
+menuitem[checked="true"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
+}
+
 /* ::::: radio menuitem ::::: */
 
 menuitem[checked="true"][type="radio"] {
   list-style-image: url("chrome://global/skin/menu/menu-radio.gif");
 }
 
-menuitem[checked="true"][type="radio"][disabled="true"] {
-  list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif");
-}
-
 menuitem[checked="true"][type="radio"][_moz-menuactive="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-radio-hover.gif");
 }
 
+menuitem[checked="true"][type="radio"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif");
+}
+
 /* ::::: menuseparator ::::: */
 
 menuseparator {

diff --git a/EarlyBlue/global/numberbox.css b/EarlyBlue/global/numberbox.css
index e1515ce3a6679c067bebfd0e9685dcf6f79d87d8..353ffb4badc1264ff2b8cb5ed0ea4aa9043ff997 100644 (file)
--- a/EarlyBlue/global/numberbox.css
+++ b/EarlyBlue/global/numberbox.css
@@ -11,6 +11,8 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
+ * The Original Code is mozilla.org code.
+ *
  * The Initial Developer of the Original Code is the Mozilla Corporation
  * Portions created by the Initial Developer are Copyright (C) 2006
  * the Initial Developer. All Rights Reserved.

diff --git a/EarlyBlue/global/printing.css b/EarlyBlue/global/printing.css
index 41ff350880f65026b7536af79539ea239d05e5ee..f1128cd4683ac5d7367b319c46098ef6bf00d277 100644 (file)
--- a/EarlyBlue/global/printing.css
+++ b/EarlyBlue/global/printing.css
@@ -56,16 +56,6 @@
   list-style-image: url("chrome://global/skin/arrow/arrow-right-sharp.gif");
 }
 
-/* ...... scale in/decrement ..... */
-
-.up-arrow {
-  list-style-image: url("chrome://global/skin/arrow/arrow-up-sharp.gif");
-}
-
-.down-arrow {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-sharp.gif");
-}
-
 /* ..... orientation ..... */
 
 .toolbar-portrait-page {

diff --git a/EarlyBlue/global/spinbuttons.css b/EarlyBlue/global/spinbuttons.css
index b672db9d5bdcb0c5bc8dcded3ec51b537a29bab3..12ed97a0771f7442500a108efac3a384ff4346db 100644 (file)
--- a/EarlyBlue/global/spinbuttons.css
+++ b/EarlyBlue/global/spinbuttons.css
@@ -74,7 +74,7 @@ spinbuttons {
   background-repeat: no-repeat;
 }
 
-.spinbuttons-up:hover:active {
+.spinbuttons-up[disabled="true"] {
   background-image: url("chrome://global/skin/arrow/arrow-up-disabled.gif");
 }
 

diff --git a/EarlyBlue/global/textbox.css b/EarlyBlue/global/textbox.css
index 13cb2f79e65ad7f0228545667c92ec4fa5a09629..f194f30540bbdb6189e71acebd239c3bcfe16ee5 100644 (file)
--- a/EarlyBlue/global/textbox.css
+++ b/EarlyBlue/global/textbox.css
@@ -83,7 +83,7 @@ textbox[disabled="true"] {
   cursor: default;
   background-color: #FFFFFF;
   color: #CCCCCC;
-} 
+}
 
 textbox[focused="true"] {
   -moz-border-top-colors: #6699CC #6699CC;

diff --git a/EarlyBlue/messenger/accountManage.css b/EarlyBlue/messenger/accountManage.css
index 5e7e1b102f7e2c3aa3fb2c527c3dde92891163c8..5a3d52a537fd0901d92abdf5115a76d1a6a38506 100644 (file)
--- a/EarlyBlue/messenger/accountManage.css
+++ b/EarlyBlue/messenger/accountManage.css
@@ -49,6 +49,10 @@
   margin-left: 20px;
 }
 
+.fccReplyFollowsParent {
+  margin-left: 20px;
+}
+
 .selectForOfflineUseButton {
   list-style-image: url("chrome://communicator/skin/icons/offline.gif");
 }

diff --git a/EarlyBlue/messenger/primaryToolbar.css b/EarlyBlue/messenger/primaryToolbar.css
index 69cc7848f2172a1bdcf89de08c5828a57d2b116c..13b6ff38744ed820b86d3e26ce183e452bd823ee 100644 (file)
--- a/EarlyBlue/messenger/primaryToolbar.css
+++ b/EarlyBlue/messenger/primaryToolbar.css
@@ -164,3 +164,7 @@
   list-style-image: url("chrome://messenger/skin/toolbar/remote-blocked.png");
   padding: 3px;
 }
+
+#allowRemoteContentForAuthorDesc {
+  padding-left: 10px;
+}

diff --git a/EarlyBlue/messenger/virtualFolderListDialog.css b/EarlyBlue/messenger/virtualFolderListDialog.css
index 1eacf1454ccf3850920776ae34d568eb9c60b857..f97b23905c1ea72730bdd9a5999432166b9b4c36 100644 (file)
--- a/EarlyBlue/messenger/virtualFolderListDialog.css
+++ b/EarlyBlue/messenger/virtualFolderListDialog.css
@@ -3,6 +3,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/mailWindow1.css");
+@import url("chrome://messenger/skin/folderPane.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");