keep up with trunk development

diff --git a/LCARStrek/communicator/alerts/alert.css b/LCARStrek/communicator/alerts/alert.css
index cb7b33943a2b93f12d058afae5c27ec054826ae0..a9382b2227d72eecd1729a655c96a74f37084b5c 100644 (file)
--- a/LCARStrek/communicator/alerts/alert.css
+++ b/LCARStrek/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/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css
index 5883621961c4e0fc4addbaa7ddb25ebe34630264..189e7a27b06d3c5084104c59c5fd65879dfedec0 100644 (file)
--- a/LCARStrek/communicator/communicator.css
+++ b/LCARStrek/communicator/communicator.css
@@ -105,11 +105,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/LCARStrek/communicator/icons/autoscroll-ew.gif b/LCARStrek/communicator/icons/autoscroll-ew.gif
deleted file mode 100644 (file)
index 05d252e..0000000
Binary files a/LCARStrek/communicator/icons/autoscroll-ew.gif and /dev/null differ

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

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

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

diff --git a/LCARStrek/communicator/smileys.css b/LCARStrek/communicator/smileys.css
index 942a4c99941c189d52207ccf450624fde9e630a2..e09363e499fb4887a409be641fd78b1fc6a97b99 100644 (file)
--- a/LCARStrek/communicator/smileys.css
+++ b/LCARStrek/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/LCARStrek/global/menu.css b/LCARStrek/global/menu.css
index 743e0870db5638f98eaa39b978cf0398660b5ca6..13ef457a855d675c5d7fad3f35b47e6710282415 100644 (file)
--- a/LCARStrek/global/menu.css
+++ b/LCARStrek/global/menu.css
@@ -189,28 +189,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/LCARStrek/global/numberbox.css b/LCARStrek/global/numberbox.css
index e1515ce3a6679c067bebfd0e9685dcf6f79d87d8..353ffb4badc1264ff2b8cb5ed0ea4aa9043ff997 100644 (file)
--- a/LCARStrek/global/numberbox.css
+++ b/LCARStrek/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/LCARStrek/global/printing.css b/LCARStrek/global/printing.css
index c5f56b355f7b6f092038696d641b12d66cafb9cb..e9ba4f10e696da026973c33ef9ee045c74db1e75 100644 (file)
--- a/LCARStrek/global/printing.css
+++ b/LCARStrek/global/printing.css
@@ -72,24 +72,6 @@
   list-style-image: url("chrome://global/skin/arrow/arrow-right-sharp-hover.gif");
 }
 
-/* ...... scale in/decrement ..... */
-
-.up-arrow {
-  list-style-image: url("chrome://global/skin/arrow/arrow-up-sharp.gif");
-}
-
-.up-arrow:hover {
-  list-style-image: url("chrome://global/skin/arrow/arrow-up-sharp-hover.gif");
-}
-
-.down-arrow {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-sharp.gif");
-}
-
-.down-arrow:hover {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-sharp-hover.gif");
-}
-
 /* ..... orientation ..... */
 
 .toolbar-portrait-page {

diff --git a/LCARStrek/messenger/accountManage.css b/LCARStrek/messenger/accountManage.css
index da8e0b96adf7d9b3fa6dea6c7eb066168cfa6947..d5d99f9349327d419cc499b8b96e67a121914180 100644 (file)
--- a/LCARStrek/messenger/accountManage.css
+++ b/LCARStrek/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/LCARStrek/messenger/primaryToolbar.css b/LCARStrek/messenger/primaryToolbar.css
index 83a5933976fb75e61504564f2a14246d8afbf12e..c46b07880ceaeb059f0f0a95de60fcfa63213ae5 100644 (file)
--- a/LCARStrek/messenger/primaryToolbar.css
+++ b/LCARStrek/messenger/primaryToolbar.css
@@ -231,3 +231,7 @@
   list-style-image: url("chrome://messenger/skin/toolbar/remote-blocked.png");
   padding: 3px;
 }
+
+#allowRemoteContentForAuthorDesc {
+  padding-left: 10px;
+}

diff --git a/LCARStrek/messenger/virtualFolderListDialog.css b/LCARStrek/messenger/virtualFolderListDialog.css
index 1eacf1454ccf3850920776ae34d568eb9c60b857..f97b23905c1ea72730bdd9a5999432166b9b4c36 100644 (file)
--- a/LCARStrek/messenger/virtualFolderListDialog.css
+++ b/LCARStrek/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");