From 8f5d5e2121c5fb6730b4e2d2359ba3eb1cc98ede Mon Sep 17 00:00:00 2001
From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Sun, 24 Nov 2013 20:04:59 +0100
Subject: [PATCH] sync both themes with suite classic changes in SeaMonkey 2.23
 cycle

---
 EarlyBlue/communicator/aboutSyncTabs.css      |   6 +-
 EarlyBlue/communicator/communicator.css       |   6 ++
 EarlyBlue/communicator/profile/profile.css    |  29 +-----
 EarlyBlue/communicator/sidebar/preview.css    |   2 +-
 EarlyBlue/communicator/smileys.css            |  96 +++++++++---------
 EarlyBlue/communicator/sync/syncCommon.css    |   6 +-
 EarlyBlue/editor/EditorDialog.css             |   6 +-
 EarlyBlue/messenger/dialogs.css               |  25 +----
 EarlyBlue/messenger/icons/info.png            | Bin 0 -> 196 bytes
 EarlyBlue/messenger/icons/junk.png            | Bin 0 -> 188 bytes
 EarlyBlue/messenger/icons/phishing.png        | Bin 0 -> 193 bytes
 .../{toolbar => icons}/remote-blocked.png     | Bin
 EarlyBlue/messenger/messageBody.css           |  22 ++--
 EarlyBlue/messenger/primaryToolbar.css        |  27 ++---
 LCARStrek/communicator/aboutSyncTabs.css      |   6 +-
 LCARStrek/communicator/communicator.css       |   6 ++
 LCARStrek/communicator/profile/profile.css    |  27 +----
 LCARStrek/communicator/sidebar/preview.css    |   2 +-
 LCARStrek/communicator/smileys.css            |  96 +++++++++---------
 LCARStrek/communicator/sync/syncCommon.css    |   6 +-
 LCARStrek/editor/EditorDialog.css             |   8 +-
 LCARStrek/messenger/dialogs.css               |  25 +----
 LCARStrek/messenger/icons/info.png            | Bin 0 -> 196 bytes
 LCARStrek/messenger/icons/junk.png            | Bin 0 -> 188 bytes
 LCARStrek/messenger/icons/phishing.png        | Bin 0 -> 193 bytes
 .../{toolbar => icons}/remote-blocked.png     | Bin
 LCARStrek/messenger/messageBody.css           |  22 ++--
 LCARStrek/messenger/primaryToolbar.css        |  27 ++---
 28 files changed, 174 insertions(+), 276 deletions(-)
 create mode 100644 EarlyBlue/messenger/icons/info.png
 create mode 100644 EarlyBlue/messenger/icons/junk.png
 create mode 100644 EarlyBlue/messenger/icons/phishing.png
 rename EarlyBlue/messenger/{toolbar => icons}/remote-blocked.png (100%)
 create mode 100644 LCARStrek/messenger/icons/info.png
 create mode 100644 LCARStrek/messenger/icons/junk.png
 create mode 100644 LCARStrek/messenger/icons/phishing.png
 rename LCARStrek/messenger/{toolbar => icons}/remote-blocked.png (100%)

diff --git a/EarlyBlue/communicator/aboutSyncTabs.css b/EarlyBlue/communicator/aboutSyncTabs.css
index 21f85342..5039f341 100644
--- a/EarlyBlue/communicator/aboutSyncTabs.css
+++ b/EarlyBlue/communicator/aboutSyncTabs.css
@@ -51,10 +51,12 @@ richlistitem[type="client"] {
   background-color: transparent;
   -moz-user-focus: ignore !important;
 }
-richlistitem.mobile[type="client"] {
+
+.mobile[type="client"] {
   list-style-image: url("chrome://communicator/skin/sync/sync-mobileIcon.png");
 }
-richlistitem.desktop[type="client"] {
+
+.desktop[type="client"] {
   list-style-image: url("chrome://communicator/skin/sync/sync-desktopIcon.png");
 }
 
diff --git a/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css
index b9a4b65a..9411efa4 100644
--- a/EarlyBlue/communicator/communicator.css
+++ b/EarlyBlue/communicator/communicator.css
@@ -40,6 +40,12 @@
   font-weight: bold;
 }
 
+/* ::::: error messages ::::: */
+
+description.error {
+  color: #FF0000;
+}
+
 /* ::::: directional button icons ::::: */
 
 .up {
diff --git a/EarlyBlue/communicator/profile/profile.css b/EarlyBlue/communicator/profile/profile.css
index 8cc66928..cd45f5ec 100644
--- a/EarlyBlue/communicator/profile/profile.css
+++ b/EarlyBlue/communicator/profile/profile.css
@@ -6,10 +6,6 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-window.dialog {
-  padding: 0;
-}
-
 treechildren::-moz-tree-image {
   -moz-margin-end: 2px;
   list-style-image: url("chrome://communicator/skin/profile/profileicon-large.gif");
@@ -20,31 +16,10 @@ treechildren::-moz-tree-image(rowMigrate-no) {
 }
 
 /* profile selection dialog */
-html#intro {
+#intro {
   width: 17em;
 }
 
-box#managebuttons > button {
+#managebuttons > button {
   min-width: 8em;
 }
-
-/* display area */
-box#contentarea {
-  border-top: 2px groove #CCCCCC;
-  border-bottom: 2px groove #CCCCCC;
-  padding: 7px;
-}
-
-/* top border on status area */
-box#wizardButtons {
-  padding-top: 1px;
-  padding-bottom: 1px;
-}
-
-box.selection {
-  margin-top: 4px;
-}
-
-description.error {
-  color: #FF0000;
-}
\ No newline at end of file
diff --git a/EarlyBlue/communicator/sidebar/preview.css b/EarlyBlue/communicator/sidebar/preview.css
index bf129e09..5a407b79 100644
--- a/EarlyBlue/communicator/sidebar/preview.css
+++ b/EarlyBlue/communicator/sidebar/preview.css
@@ -8,7 +8,7 @@
    Style rules specific to the Preview dialog.
 */
 
-iframe#previewframe {
+#previewframe {
  min-width: 10px;
  min-height: 10px;
  width: 162px;
diff --git a/EarlyBlue/communicator/smileys.css b/EarlyBlue/communicator/smileys.css
index ce5f9bea..a249b299 100644
--- a/EarlyBlue/communicator/smileys.css
+++ b/EarlyBlue/communicator/smileys.css
@@ -11,124 +11,124 @@
 
 /* ::::: we also represent smilies inside of spans ::::: */
 
-span.moz-smiley-s1,
-span.moz-smiley-s2,
-span.moz-smiley-s3,
-span.moz-smiley-s4,
-span.moz-smiley-s5,
-span.moz-smiley-s6,
-span.moz-smiley-s7,
-span.moz-smiley-s8,
-span.moz-smiley-s9,
-span.moz-smiley-s10,
-span.moz-smiley-s11,
-span.moz-smiley-s12,
-span.moz-smiley-s13,
-span.moz-smiley-s14,
-span.moz-smiley-s15,
-span.moz-smiley-s16
+.moz-smiley-s1,
+.moz-smiley-s2,
+.moz-smiley-s3,
+.moz-smiley-s4,
+.moz-smiley-s5,
+.moz-smiley-s6,
+.moz-smiley-s7,
+.moz-smiley-s8,
+.moz-smiley-s9,
+.moz-smiley-s10,
+.moz-smiley-s11,
+.moz-smiley-s12,
+.moz-smiley-s13,
+.moz-smiley-s14,
+.moz-smiley-s15,
+.moz-smiley-s16
 {
   display: inline-block;
   vertical-align: middle;
   -moz-user-select: all;
 }
 
-span.moz-smiley-s1 > span,
-span.moz-smiley-s2 > span,
-span.moz-smiley-s3 > span,
-span.moz-smiley-s4 > span,
-span.moz-smiley-s5 > span,
-span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span,
-span.moz-smiley-s8 > span,
-span.moz-smiley-s9 > span,
-span.moz-smiley-s10 > span,
-span.moz-smiley-s11 > span,
-span.moz-smiley-s12 > span,
-span.moz-smiley-s13 > span,
-span.moz-smiley-s14 > span,
-span.moz-smiley-s15 > span,
-span.moz-smiley-s16 > span
+.moz-smiley-s1 > span,
+.moz-smiley-s2 > span,
+.moz-smiley-s3 > span,
+.moz-smiley-s4 > span,
+.moz-smiley-s5 > span,
+.moz-smiley-s6 > span,
+.moz-smiley-s7 > span,
+.moz-smiley-s8 > span,
+.moz-smiley-s9 > span,
+.moz-smiley-s10 > span,
+.moz-smiley-s11 > span,
+.moz-smiley-s12 > span,
+.moz-smiley-s13 > span,
+.moz-smiley-s14 > span,
+.moz-smiley-s15 > span,
+.moz-smiley-s16 > span
 {
     display: none;
 }
 
 /* smile */
-span.moz-smiley-s1:before {
+.moz-smiley-s1:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
 }
 
 /* frown */
-span.moz-smiley-s2:before {
+.moz-smiley-s2:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
 }
 
 /* wink */
-span.moz-smiley-s3:before {
+.moz-smiley-s3:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
 }
 
 /* tongue */
-span.moz-smiley-s4:before {
+.moz-smiley-s4:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-tongue.png");
 }
 
 /* laughing */
-span.moz-smiley-s5:before {
+.moz-smiley-s5:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
 }
 
 /* embarrassed */
-span.moz-smiley-s6:before {
+.moz-smiley-s6:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-embarrassed.png");
 }
 
 /* undecided */
-span.moz-smiley-s7:before {
+.moz-smiley-s7:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
 }
 
 /* surprise */
-span.moz-smiley-s8:before {
+.moz-smiley-s8:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-surprise.png");
 }
 
 /* kiss */
-span.moz-smiley-s9:before {
+.moz-smiley-s9:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
 }
 
 /* yell */
-span.moz-smiley-s10:before {
+.moz-smiley-s10:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
 }
 
 /* cool */
-span.moz-smiley-s11:before {
+.moz-smiley-s11:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
 }
 
 /* money */
-span.moz-smiley-s12:before {
+.moz-smiley-s12:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-money.png");
 }
 
 /* foot */
-span.moz-smiley-s13:before {
+.moz-smiley-s13:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-foot.png");
 }
 
 /* innocent */
-span.moz-smiley-s14:before {
+.moz-smiley-s14:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
 }
 
 /* cry */
-span.moz-smiley-s15:before {
+.moz-smiley-s15:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
 }
 
 /* sealed */
-span.moz-smiley-s16:before {
+.moz-smiley-s16:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
 }
diff --git a/EarlyBlue/communicator/sync/syncCommon.css b/EarlyBlue/communicator/sync/syncCommon.css
index 71b5cef5..a14df99a 100644
--- a/EarlyBlue/communicator/sync/syncCommon.css
+++ b/EarlyBlue/communicator/sync/syncCommon.css
@@ -28,14 +28,10 @@
   font-weight: bold;
 }
 
-dialog#change-dialog {
+#change-dialog {
   width: 40em;
 }
 
-image#syncIcon {
-  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
-}
-
 #introText {
   margin-top: 2px;
 }
diff --git a/EarlyBlue/editor/EditorDialog.css b/EarlyBlue/editor/EditorDialog.css
index 8f8dcffb..270397f7 100644
--- a/EarlyBlue/editor/EditorDialog.css
+++ b/EarlyBlue/editor/EditorDialog.css
@@ -12,10 +12,6 @@
   min-width: 10em;
 }
 
-.MinWidth15em {
-  min-width: 15em;
-}
-
 .MinWidth20em {
   min-width: 20em;
 }
@@ -245,7 +241,7 @@
 }
 
 /* styles for an attribute tree-table */
-tree.AttributesTree {
+.AttributesTree {
   min-width: 200px;
   min-height: 200px;
 }
diff --git a/EarlyBlue/messenger/dialogs.css b/EarlyBlue/messenger/dialogs.css
index 3c50c7a1..7ed02d1a 100644
--- a/EarlyBlue/messenger/dialogs.css
+++ b/EarlyBlue/messenger/dialogs.css
@@ -10,27 +10,4 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: button-like menus ::::: */
-
-menu.push {
-  border: 1px outset #CCD0DD;
-  padding: 2px;
-  margin: 2px;
-  background-color: inherit;
-  background-image: inherit;
-}
-
-menu.push:hover:active,
-menu.push[open] {
-  border-style: inset;
-  padding-top: 3px;
-  padding-bottom: 1px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 1px;
-}
-
-menu.push[disabled="true"],
-menu.push[disabled="true"]:hover,
-menu.push[disabled="true"]:hover:active {
-  color: #999999;
-}
+/* ::::: styles for messenger dialogs ::::: */
diff --git a/EarlyBlue/messenger/icons/info.png b/EarlyBlue/messenger/icons/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6958ec5dcbbe4c4e3cc00602fe6ea23bd1fe979
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uFDxZ($dcS|Nq}->FzS1
zAY)08UoeBivm0q3PLj8~3quF1tOrPWfk$L91A{uy9CZQ4DVc$iKtc8rPhVH|yWCvD
zCMN%$=lKJLOgvp2LpZL-_G}bnP~bRn$)Kq^P{J%Z-v3R`r9bKdoEj}^fpgcqI(w=2
j>c5KDN9VZDKHw{RxLoi-?w4|Ppne8VS3j3^P6<r_aDhA*

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/icons/junk.png b/EarlyBlue/messenger/icons/junk.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbd674912f6922df19435a07508a3ef5e29a7654
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uBr?h($dcS|Nnn}S49_4
zkg+7lFPOpM*^M+1C&}C0g`tC0)&r!xz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0YKp<`T9N
ziRMb?1PbYRx;Tb#Tu)ADU|?5Bo6DfGsDb72DOHCgwFwCxr&)v+E>yVYBh!+>!OX<K
YaBeTR=Hp$Nd_a8+p00i_>zopr01AXJV*mgE

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/icons/phishing.png b/EarlyBlue/messenger/icons/phishing.png
new file mode 100644
index 0000000000000000000000000000000000000000..65bfc18e1ced1c5550ad9ce9723338072fcaae1d
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uJ0H+{xdNA|Nmc4WEMz}
zu_VYZn8D%MjWiG^$=lt9p@UV{1EjpbBeEE1+;tFUbkdkz0Tg5}@$_|Nzst=fY_1(~
z$e<D^Wa#PQ7{YNqIUym1q3MDE8{5ST7Z@}I+nN)2c}o)#c$tNI7B1uwU|KWX(S*T+
bp_hq4Fo!4hO_bDhpk@Y7S3j3^P6<r_rjjww

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/toolbar/remote-blocked.png b/EarlyBlue/messenger/icons/remote-blocked.png
similarity index 100%
rename from EarlyBlue/messenger/toolbar/remote-blocked.png
rename to EarlyBlue/messenger/icons/remote-blocked.png
diff --git a/EarlyBlue/messenger/messageBody.css b/EarlyBlue/messenger/messageBody.css
index 4086262c..fe219123 100644
--- a/EarlyBlue/messenger/messageBody.css
+++ b/EarlyBlue/messenger/messageBody.css
@@ -23,7 +23,7 @@
   background-color: #DEDEDE;
 }
 
-div.headerdisplayname {
+.headerdisplayname {
   display: inline;
   font-weight: bold;
   white-space: pre;
@@ -70,20 +70,22 @@ div.headerdisplayname {
   display: none;
 }
 
-span.moz-txt-underscore {
+.moz-txt-underscore {
   text-decoration: underline;
 }
 
-span.moz-txt-formfeed {
+.moz-txt-formfeed {
   display: block;
   height: 100%;
 }
 
 /* ::::: signature ::::: */
 
-.moz-txt-sig,
-.moz-signature {
-  opacity: 0.5;
+@media not print {
+  .moz-txt-sig,
+  .moz-signature {
+    opacity: 0.5;
+  }
 }
 
 /* ::::: vcard ::::: */
@@ -112,12 +114,16 @@ span.moz-txt-formfeed {
 
 /* ::::: attached images ::::: */
 
+.moz-attached-image {
+  image-orientation: from-image;
+}
+
 moz-attached-image[overflowing="true"] {
-  cursor: -moz-zoom-out;
+  cursor: zoom-out;
 }
 
 .moz-attached-image[isshrunk="true"] {
-  cursor: -moz-zoom-in;
+  cursor: zoom-in;
   max-width: 100%;
 }
 
diff --git a/EarlyBlue/messenger/primaryToolbar.css b/EarlyBlue/messenger/primaryToolbar.css
index 35fdef77..5b8784eb 100644
--- a/EarlyBlue/messenger/primaryToolbar.css
+++ b/EarlyBlue/messenger/primaryToolbar.css
@@ -314,29 +314,18 @@ toolbar[iconsize="small"] > #sync-button[status=active] {
   text-shadow: none;
 }
 
-.msgNotificationBarText {
-  font-weight: bold;
+.messageImage[value="remoteContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/remote-blocked.png");
 }
 
-#junkBarImage {
-  list-style-image: url("chrome://messenger/skin/toolbar/junk.gif");
+.messageImage[value="junkContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/junk.png");
 }
 
-#junkIcon {
-  -moz-margin-start: 0.5ex;
-  list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
+.messageImage[value="phishingContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/phishing.png");
 }
 
-#remoteContentImage {
-  list-style-image: url("chrome://messenger/skin/toolbar/remote-blocked.png");
-  padding: 3px;
-}
-
-#mdnBarImage {
-  list-style-image: url("chrome://global/skin/icons/alert-question.gif");
-  padding: 3px;
-}
-
-#allowRemoteContentForAuthorDesc {
-  -moz-padding-start: 10px;
+.messageImage[value="mdnContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/info.png");
 }
diff --git a/LCARStrek/communicator/aboutSyncTabs.css b/LCARStrek/communicator/aboutSyncTabs.css
index 5d955a6f..b72daf2d 100644
--- a/LCARStrek/communicator/aboutSyncTabs.css
+++ b/LCARStrek/communicator/aboutSyncTabs.css
@@ -51,10 +51,12 @@ richlistitem[type="client"] {
   background-color: transparent;
   -moz-user-focus: ignore !important;
 }
-richlistitem.mobile[type="client"] {
+
+.mobile[type="client"] {
   list-style-image: url("chrome://communicator/skin/sync/sync-mobileIcon.png");
 }
-richlistitem.desktop[type="client"] {
+
+.desktop[type="client"] {
   list-style-image: url("chrome://communicator/skin/sync/sync-desktopIcon.png");
 }
 
diff --git a/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css
index d479aaac..ef4b2905 100644
--- a/LCARStrek/communicator/communicator.css
+++ b/LCARStrek/communicator/communicator.css
@@ -57,6 +57,12 @@ menubar[xpfe="false"] {
   font-weight: bold;
 }
 
+/* ::::: error messages ::::: */
+
+description.error {
+  color: #FF0000;
+}
+
 /* ::::: directional button icons ::::: */
 
 .up {
diff --git a/LCARStrek/communicator/profile/profile.css b/LCARStrek/communicator/profile/profile.css
index d6f10759..6af2db5c 100644
--- a/LCARStrek/communicator/profile/profile.css
+++ b/LCARStrek/communicator/profile/profile.css
@@ -6,11 +6,11 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+/* Make nice LCARS border */
 window.dialog {
   padding: 0;
 }
 
-/* Make nice LCARS border */
 .dialog-content-box {
   background-color: #A09090;
   border-radius: 5px 0 0 0;
@@ -63,31 +63,10 @@ treechildren::-moz-tree-image(rowMigrate-no) {
 }
 
 /* profile selection dialog */
-html#intro {
+#intro {
   width: 17em;
 }
 
-box#managebuttons > button {
+#managebuttons > button {
   min-width: 8em;
 }
-
-/* display area */
-box#contentarea {
-  border-top: 2px solid #9C9CFF;
-  border-bottom: 2px solid #9C9CFF;
-  padding: 7px;
-}
-
-/* top border on status area */
-box#wizardButtons {
-  padding-top: 1px;
-  padding-bottom: 1px;
-}
-
-box.selection {
-  margin-top: 4px;
-}
-
-description.error {
-  color: #FF0000;
-}
diff --git a/LCARStrek/communicator/sidebar/preview.css b/LCARStrek/communicator/sidebar/preview.css
index bf129e09..5a407b79 100644
--- a/LCARStrek/communicator/sidebar/preview.css
+++ b/LCARStrek/communicator/sidebar/preview.css
@@ -8,7 +8,7 @@
    Style rules specific to the Preview dialog.
 */
 
-iframe#previewframe {
+#previewframe {
  min-width: 10px;
  min-height: 10px;
  width: 162px;
diff --git a/LCARStrek/communicator/smileys.css b/LCARStrek/communicator/smileys.css
index ce5f9bea..a249b299 100644
--- a/LCARStrek/communicator/smileys.css
+++ b/LCARStrek/communicator/smileys.css
@@ -11,124 +11,124 @@
 
 /* ::::: we also represent smilies inside of spans ::::: */
 
-span.moz-smiley-s1,
-span.moz-smiley-s2,
-span.moz-smiley-s3,
-span.moz-smiley-s4,
-span.moz-smiley-s5,
-span.moz-smiley-s6,
-span.moz-smiley-s7,
-span.moz-smiley-s8,
-span.moz-smiley-s9,
-span.moz-smiley-s10,
-span.moz-smiley-s11,
-span.moz-smiley-s12,
-span.moz-smiley-s13,
-span.moz-smiley-s14,
-span.moz-smiley-s15,
-span.moz-smiley-s16
+.moz-smiley-s1,
+.moz-smiley-s2,
+.moz-smiley-s3,
+.moz-smiley-s4,
+.moz-smiley-s5,
+.moz-smiley-s6,
+.moz-smiley-s7,
+.moz-smiley-s8,
+.moz-smiley-s9,
+.moz-smiley-s10,
+.moz-smiley-s11,
+.moz-smiley-s12,
+.moz-smiley-s13,
+.moz-smiley-s14,
+.moz-smiley-s15,
+.moz-smiley-s16
 {
   display: inline-block;
   vertical-align: middle;
   -moz-user-select: all;
 }
 
-span.moz-smiley-s1 > span,
-span.moz-smiley-s2 > span,
-span.moz-smiley-s3 > span,
-span.moz-smiley-s4 > span,
-span.moz-smiley-s5 > span,
-span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span,
-span.moz-smiley-s8 > span,
-span.moz-smiley-s9 > span,
-span.moz-smiley-s10 > span,
-span.moz-smiley-s11 > span,
-span.moz-smiley-s12 > span,
-span.moz-smiley-s13 > span,
-span.moz-smiley-s14 > span,
-span.moz-smiley-s15 > span,
-span.moz-smiley-s16 > span
+.moz-smiley-s1 > span,
+.moz-smiley-s2 > span,
+.moz-smiley-s3 > span,
+.moz-smiley-s4 > span,
+.moz-smiley-s5 > span,
+.moz-smiley-s6 > span,
+.moz-smiley-s7 > span,
+.moz-smiley-s8 > span,
+.moz-smiley-s9 > span,
+.moz-smiley-s10 > span,
+.moz-smiley-s11 > span,
+.moz-smiley-s12 > span,
+.moz-smiley-s13 > span,
+.moz-smiley-s14 > span,
+.moz-smiley-s15 > span,
+.moz-smiley-s16 > span
 {
     display: none;
 }
 
 /* smile */
-span.moz-smiley-s1:before {
+.moz-smiley-s1:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
 }
 
 /* frown */
-span.moz-smiley-s2:before {
+.moz-smiley-s2:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
 }
 
 /* wink */
-span.moz-smiley-s3:before {
+.moz-smiley-s3:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
 }
 
 /* tongue */
-span.moz-smiley-s4:before {
+.moz-smiley-s4:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-tongue.png");
 }
 
 /* laughing */
-span.moz-smiley-s5:before {
+.moz-smiley-s5:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
 }
 
 /* embarrassed */
-span.moz-smiley-s6:before {
+.moz-smiley-s6:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-embarrassed.png");
 }
 
 /* undecided */
-span.moz-smiley-s7:before {
+.moz-smiley-s7:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
 }
 
 /* surprise */
-span.moz-smiley-s8:before {
+.moz-smiley-s8:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-surprise.png");
 }
 
 /* kiss */
-span.moz-smiley-s9:before {
+.moz-smiley-s9:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
 }
 
 /* yell */
-span.moz-smiley-s10:before {
+.moz-smiley-s10:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
 }
 
 /* cool */
-span.moz-smiley-s11:before {
+.moz-smiley-s11:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
 }
 
 /* money */
-span.moz-smiley-s12:before {
+.moz-smiley-s12:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-money.png");
 }
 
 /* foot */
-span.moz-smiley-s13:before {
+.moz-smiley-s13:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-foot.png");
 }
 
 /* innocent */
-span.moz-smiley-s14:before {
+.moz-smiley-s14:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
 }
 
 /* cry */
-span.moz-smiley-s15:before {
+.moz-smiley-s15:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
 }
 
 /* sealed */
-span.moz-smiley-s16:before {
+.moz-smiley-s16:before {
   content: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
 }
diff --git a/LCARStrek/communicator/sync/syncCommon.css b/LCARStrek/communicator/sync/syncCommon.css
index dd9ead20..df32270d 100644
--- a/LCARStrek/communicator/sync/syncCommon.css
+++ b/LCARStrek/communicator/sync/syncCommon.css
@@ -28,14 +28,10 @@
   font-weight: bold;
 }
 
-dialog#change-dialog {
+#change-dialog {
   width: 40em;
 }
 
-image#syncIcon {
-  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
-}
-
 #introText {
   margin-top: 2px;
 }
diff --git a/LCARStrek/editor/EditorDialog.css b/LCARStrek/editor/EditorDialog.css
index 4ab15976..cccfd536 100644
--- a/LCARStrek/editor/EditorDialog.css
+++ b/LCARStrek/editor/EditorDialog.css
@@ -12,10 +12,6 @@
   min-width: 10em;
 }
 
-.MinWidth15em {
-  min-width: 15em;
-}
-
 .MinWidth20em {
   min-width: 20em;
 }
@@ -213,7 +209,7 @@
 
 /* Don't change width/height of these without changing values in 
   GetOriginalWidth(), EdImageProps.js
-*/    
+*/
 #preview-image-box {
   border: 1px inset #9C9CFF;
   width: 82px;
@@ -243,7 +239,7 @@
 }
 
 /* styles for an attribute tree-table */
-tree.AttributesTree {
+.AttributesTree {
   min-width: 200px;
   min-height: 200px;
 }
diff --git a/LCARStrek/messenger/dialogs.css b/LCARStrek/messenger/dialogs.css
index 53fad23d..7ed02d1a 100644
--- a/LCARStrek/messenger/dialogs.css
+++ b/LCARStrek/messenger/dialogs.css
@@ -10,27 +10,4 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: button-like menus ::::: */
-
-menu.push {
-  border: 1px solid #FF9F00;
-  padding: 2px;
-  margin: 2px;
-  background-color: inherit;
-  background-image: inherit;
-}
-
-menu.push:hover:active,
-menu.push[open] {
-  border-color: #FFCF00;
-  padding-top: 3px;
-  padding-bottom: 1px;
-  -moz-padding-start: 3px;
-  -moz-padding-end: 1px;
-}
-
-menu.push[disabled="true"],
-menu.push[disabled="true"]:hover,
-menu.push[disabled="true"]:hover:active {
-  color: #8050B0;
-}
+/* ::::: styles for messenger dialogs ::::: */
diff --git a/LCARStrek/messenger/icons/info.png b/LCARStrek/messenger/icons/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..7493d4e56a66fa91bd2f78bd1790f8d42e7ce865
GIT binary patch
literal 196
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uKo-PbLRa2f1W`;;-?)@
zkg+7lFPOpM*^M+1C&}C0g`tC0)&r!xz$3Dlfk7Q;j=BKjl*~X$pdfpRr>`sfU2ZO6
z6K1!l(+)r(6Hgb%5RU7yJsSlX6gZAtGH9v}lrT$<_kWXf>5sYqr$&of;M_H@&R*)h
j`mf^k(K+t35BSO+E*E@|`=wkRsGq^p)z4*}Q$iB}4na99

literal 0
HcmV?d00001

diff --git a/LCARStrek/messenger/icons/junk.png b/LCARStrek/messenger/icons/junk.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ab21f2ea7b943fbc33e9261c49f1ce20bc6b2a1
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uCo{n=FIv3|2%`5SYjJc
zkg+7lFPOpM*^M+1C&}C0g`tC0)&r!xz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0YKp788}^
zc>mzeCZLdxr;B3<$Mxid1_pM8w7Co_iyBxSpHg*5Qk#(AahgSF;X;LLJ~AyC9L!7%
Z4CnT8Yd+qU$p_TO;OXk;vd$@?2>{k^Ff9N8

literal 0
HcmV?d00001

diff --git a/LCARStrek/messenger/icons/phishing.png b/LCARStrek/messenger/icons/phishing.png
new file mode 100644
index 0000000000000000000000000000000000000000..b531b68958801e3aa4dccbdb4a5a17621d9a6c37
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uBRCe{AXbJf1V-v(*8Q2
zAY)08UoeBivm0q3PLj8~3quF1tOrPWfk$L9(75X$%;=;sy8<Z4UgGKN%6^wyOjJT~
zi)ZP4ppc=bi(?4K_2h(v6o#e?0&Hv-FI-^I5NvBs;N>k%NZ@4_>RGsuM}TR~bVm~g
d4~AYQ2EiPj*f&v9(}9{9JYD@<);T3K0RVEWF^m8J

literal 0
HcmV?d00001

diff --git a/LCARStrek/messenger/toolbar/remote-blocked.png b/LCARStrek/messenger/icons/remote-blocked.png
similarity index 100%
rename from LCARStrek/messenger/toolbar/remote-blocked.png
rename to LCARStrek/messenger/icons/remote-blocked.png
diff --git a/LCARStrek/messenger/messageBody.css b/LCARStrek/messenger/messageBody.css
index d9dc71e7..580e70c2 100644
--- a/LCARStrek/messenger/messageBody.css
+++ b/LCARStrek/messenger/messageBody.css
@@ -23,7 +23,7 @@
   background-color: #DEDEDE;
 }
 
-div.headerdisplayname {
+.headerdisplayname {
   display: inline;
   font-weight: bold;
   white-space: pre;
@@ -70,20 +70,22 @@ div.headerdisplayname {
   display: none;
 }
 
-span.moz-txt-underscore {
+.moz-txt-underscore {
   text-decoration: underline;
 }
 
-span.moz-txt-formfeed {
+.moz-txt-formfeed {
   display: block;
   height: 100%;
 }
 
 /* ::::: signature ::::: */
 
-.moz-txt-sig,
-.moz-signature {
-  opacity: 0.5;
+@media not print {
+  .moz-txt-sig,
+  .moz-signature {
+    opacity: 0.5;
+  }
 }
 
 /* ::::: vcard ::::: */
@@ -112,12 +114,16 @@ span.moz-txt-formfeed {
 
 /* ::::: attached images ::::: */
 
+.moz-attached-image {
+  image-orientation: from-image;
+}
+
 moz-attached-image[overflowing="true"] {
-  cursor: -moz-zoom-out;
+  cursor: zoom-out;
 }
 
 .moz-attached-image[isshrunk="true"] {
-  cursor: -moz-zoom-in;
+  cursor: zoom-in;
   max-width: 100%;
 }
 
diff --git a/LCARStrek/messenger/primaryToolbar.css b/LCARStrek/messenger/primaryToolbar.css
index 6d91d8b5..e5e89798 100644
--- a/LCARStrek/messenger/primaryToolbar.css
+++ b/LCARStrek/messenger/primaryToolbar.css
@@ -467,29 +467,18 @@ toolbar[iconsize="small"] > #sync-button[status=active] {
   text-shadow: none;
 }
 
-.msgNotificationBarText {
-  font-weight: bold;
+.messageImage[value="remoteContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/remote-blocked.png");
 }
 
-#junkBarImage {
-  list-style-image: url("chrome://messenger/skin/toolbar/junk-hover.gif");
+.messageImage[value="junkContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/junk.png");
 }
 
-#junkIcon {
-  -moz-margin-start: 0.5ex;
-  list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
+.messageImage[value="phishingContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/phishing.png");
 }
 
-#remoteContentImage {
-  list-style-image: url("chrome://messenger/skin/toolbar/remote-blocked.png");
-  padding: 3px;
-}
-
-#mdnBarImage {
-  list-style-image: url("chrome://global/skin/icons/alert-question.gif");
-  padding: 3px;
-}
-
-#allowRemoteContentForAuthorDesc {
-  -moz-padding-start: 10px;
+.messageImage[value="mdnContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/info.png");
 }
-- 
2.43.0