From 8c976b60be76177a7648277854761ef91e0be41f Mon Sep 17 00:00:00 2001
From: robert <robert>
Date: Fri, 12 Jan 2007 19:34:24 +0000
Subject: [PATCH] keep up with trunk development

---
 LCARStrek/communicator/alerts/alert.css       |  25 +++++++++----
 LCARStrek/communicator/communicator.css       |  34 ++++++++++++++++--
 .../communicator/icons/autoscroll-ew.gif      | Bin 148 -> 0 bytes
 .../communicator/icons/autoscroll-ns.gif      | Bin 137 -> 0 bytes
 LCARStrek/communicator/icons/autoscroll.gif   | Bin 162 -> 0 bytes
 LCARStrek/communicator/icons/autoscroll.png   | Bin 0 -> 1216 bytes
 LCARStrek/communicator/smileys.css            |   2 +-
 LCARStrek/global/menu.css                     |  16 ++++-----
 LCARStrek/global/numberbox.css                |   2 ++
 LCARStrek/global/printing.css                 |  18 ----------
 LCARStrek/messenger/accountManage.css         |   4 +++
 LCARStrek/messenger/primaryToolbar.css        |   4 +++
 .../messenger/virtualFolderListDialog.css     |   1 +
 13 files changed, 70 insertions(+), 36 deletions(-)
 delete mode 100644 LCARStrek/communicator/icons/autoscroll-ew.gif
 delete mode 100644 LCARStrek/communicator/icons/autoscroll-ns.gif
 delete mode 100644 LCARStrek/communicator/icons/autoscroll.gif
 create mode 100644 LCARStrek/communicator/icons/autoscroll.png

diff --git a/LCARStrek/communicator/alerts/alert.css b/LCARStrek/communicator/alerts/alert.css
index cb7b3394..a9382b22 100644
--- 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 58836219..189e7a27 100644
--- 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
index 05d252eb73996849dfd4fe604029bf0437cf81a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 148
zcmZ?wbhEHblwpuzn8*MEEiEno|NjRv6o0a?axpM7=zv5)@(fI=J^d@CAMr2lNxSu0
z>s~<dyV?kis1(h)8P`jaez!0xFl~5nwuJpgAphkTWi#ajl5#@ZTpBNS_&kz2^WyR=
wVW;HtvrA6pKI*&pAUDkVeu4g}s-sP_?-do?tv&ucxn$?5^8y+Y0SpY*03}a6^#A|>

diff --git a/LCARStrek/communicator/icons/autoscroll-ns.gif b/LCARStrek/communicator/icons/autoscroll-ns.gif
deleted file mode 100644
index 583cc516e23dd6b83f20e16a956da51afa6593af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 137
zcmZ?wbhEHblwpuzn8*MEEiEno|NjRv6o0a?axpM7=zv5)@(fH-J^d@CAMr2lNxPI5
ze^!a1A$9iCS_N~jrInKuk8aYRQdDMsKWUwR>HEhQ?VNl!Dm%+2GpM$|6j3eTc1e(Z
kO<d!Co!r~6m1gRO7N%OsUwpkfv|6}+uXWqsI0go50NIo>6aWAK

diff --git a/LCARStrek/communicator/icons/autoscroll.gif b/LCARStrek/communicator/icons/autoscroll.gif
deleted file mode 100644
index 7108e6cd2d6730d3a42a18f334374307567bf2d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmZ?wbhEHblwpuzn8*ME4Gj(d|NjRv6o0a?axpM7=zv5)@(fJHJ^d@CAMr2lNxPI5
ze^!a1A$9iCS_N~jrInKuk8aYRQdDMs|IwVu;=C6)qxu3l-AZblW{Y0<(j+Fm`hjv<
zsF!vq$F<!@EliCHPXBN`H*MB*_Ze%xs_of1A#K0EXN1|^xToLSgSI6HPiij?HeRv)
LFoR?y1A{dHiS9ni

diff --git a/LCARStrek/communicator/icons/autoscroll.png b/LCARStrek/communicator/icons/autoscroll.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3b40475b7cc7e747b69c42037eab9004e2929b3
GIT binary patch
literal 1216
zcmV;x1V8(UP)<h;3K|Lk000e1NJLTq002|~002}71ONa4wqn>y0000LbVXQnLvm$d
zbZKvHAXI5>WdH}(2?7%iFx-(G6951J2XskIMF-Xj2on$kN*p^L00009a7bBm000W`
z000W`0Ya=am;e9-K1oDDRCwC$nm<faK^(___aG!Cl*NTe;?RLu1YN{{3xP#KG=WIe
zT?PgQCIc?DAqHGD4n|x|I+zGyU@~PejU<o;FtLC_96FJ}0K;pE2tt2eONICE?%lnX
zHpKgqP<nlz_rC94@80jeJOT*bL>TSp^0`&Da1%P91p-h*-|ayXmLLYpkg^^Qy*MRy
zBgpW{Gwg$|x`CF~+x}bRD)?zb8a7}N=hJiX)C5Ff-*f;kvh{=bmS+l9L>}nh@Q;l-
zz$muqBmzO9Lp-BDLWf7-a^PgP68h>AFES}6w}pe5>IC%BE%{v^&cBA-y57P&bGENa
zU;D(^rB*|uojZgX7}-q@z%<8b*zmWL)zbqrY`RztHhi4E-YmdPLH|nn5v&7fysPQ-
zjweCRS2Y}JZWiM1!{cTcri0GOXjq^nFVpqpb9go(banLHC1P9!^ppA?=sG!=*HQ0{
zs;!-kNiZ24Lo!QeTkD8r&jCE6VqA{ue5fBtahrHehfa;vRU%&rPh7`6f0Yzh58Zy~
z(3m?EHYCZlG!j{^i9n0yxU+l<cX;Fnk_?v{PywGb*8mXE*fx3Xywh{xYA#E2S19E;
zkDjkY%c?US!09|{zx#x^?auFnxV^MAw?-+=wj;wPT$_YQbGh4SazmP107z=qMxH_v
zt;{W!7EzA-O)FGb(wIAxFeJsr=F^8#+$OB2Y0Y1bTWC~*`F9Jgw4X_sb9N>X;!>2D
zxqP9QN=<}YZ`9Taa$n$e3MU|?@ptahMT7`*hI%v_pLvdlLfkey#qAlodUCEu-KHRx
z1i5`2f4@2-z#YRYh_AwUc9F-J@I#E9@UJPGvn)l{e~pgpPEjK~?ik*|+g%*Z*7sR)
z3a#^9-1!qjnKe3CoVo8fl<^xDcV%5JL!@3GqxGg$oA?p~I+&KrWe*_8Kx1pSzlk(J
zb*{UA!dLv1{t-t@06{KFq*I3K$?J7d*^~QVQrVMZ*Q@L)E0sO5x&JkLDuGc`_9P;Q
z?5QL&WKUwUWlts2Y4#*8Q}$$6m_Oc`w_Y}9%${U8L-yo^o&A=PE0@cj<hYBNJ=w*|
zg52cF<+3L^E}K1-etL?2mga^LqNVTp)9gu94%t&lWXPVxbdo)l-stjNJSMR@(kgE|
z4$CTgV%W?|Wlub*>`7%$DtpRHWlt)5D!?d$+qOd4lUdg6sc@s-dZ4d;XTdOsI_Ur>
zF|b3e7R9KyJ_t4>R)nZYq?3NITt<CWkq;R$>WJQ-=)~_U)Tp<U>%F7v!qghp>(E=6
zQE!xb?n&TN_1shbRXz8lo_kWyJy|&Q+>@vw_1qH{=ifJ;i;^~dOPGpbUBN|(6m2Z?
zNMtZ0_P?erY%5Bc=ecmMPD~0gNB9IukqT$eOOe3NBsIdf`3C((TZ-iN;B9ed&7RCs
e*^|ni^7;!EKhJ^Y|2LTc0000<MNUMnLSTYrayqU6

literal 0
HcmV?d00001

diff --git a/LCARStrek/communicator/smileys.css b/LCARStrek/communicator/smileys.css
index 942a4c99..e09363e4 100644
--- 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 743e0870..13ef457a 100644
--- 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 e1515ce3..353ffb4b 100644
--- 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 c5f56b35..e9ba4f10 100644
--- 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 da8e0b96..d5d99f93 100644
--- 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 83a59339..c46b0788 100644
--- 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 1eacf145..f97b2390 100644
--- 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");
 
-- 
2.43.0