sync both themes with classic theme changes in SeaMonkey 2.28 cycle

diff --git a/EarlyBlue/communicator/blockedSite.css b/EarlyBlue/communicator/blockedSite.css
new file mode 100644 (file)
index 0000000..32f5d6e
--- /dev/null
+++ b/EarlyBlue/communicator/blockedSite.css
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#buttons > span {
+  float: left;
+}
+
+#buttons > #ignoreWarningButton {
+  float: right;
+  font-size: smaller;
+}
+
+/* the following two ids refer to <span> elements defined in safeBrowsing.dtd */
+
+#malware_sitename,
+#phishing_sitename {
+  word-wrap: break-word;
+}

diff --git a/EarlyBlue/editor/editorFormatToolbar.css b/EarlyBlue/editor/editorFormatToolbar.css
index 6fcec8920ce446601f66bcc01f170ca73061e0f2..8c17cf32213b1d2479ac728c5b1d3c7156305071 100644 (file)
--- a/EarlyBlue/editor/editorFormatToolbar.css
+++ b/EarlyBlue/editor/editorFormatToolbar.css
@@ -281,6 +281,11 @@ toolbarbutton.formatting-button {
   -moz-margin-end: 9px;
 }
 
+#TextColorButton[color="mixed"] {
+  background-image: url("chrome://editor/skin/icons/multicolor.png");
+  background-size: cover;
+}
+
 #BackgroundColorButton {
   margin-top: 9px;
   margin-bottom: 2px;

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

diff --git a/LCARStrek/communicator/blockedSite.css b/LCARStrek/communicator/blockedSite.css
new file mode 100644 (file)
index 0000000..32f5d6e
--- /dev/null
+++ b/LCARStrek/communicator/blockedSite.css
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#buttons > span {
+  float: left;
+}
+
+#buttons > #ignoreWarningButton {
+  float: right;
+  font-size: smaller;
+}
+
+/* the following two ids refer to <span> elements defined in safeBrowsing.dtd */
+
+#malware_sitename,
+#phishing_sitename {
+  word-wrap: break-word;
+}

diff --git a/LCARStrek/editor/editorFormatToolbar.css b/LCARStrek/editor/editorFormatToolbar.css
index 31aac18fcb9153637844c667024a222177bb3526..df480a82486ffb6eeed06cb7a7f91d0db792bc37 100644 (file)
--- a/LCARStrek/editor/editorFormatToolbar.css
+++ b/LCARStrek/editor/editorFormatToolbar.css
@@ -403,6 +403,11 @@ toolbarbutton.formatting-button {
   -moz-margin-end: 9px;
 }
 
+#TextColorButton[color="mixed"] {
+  background-image: url("chrome://editor/skin/icons/multicolor.png");
+  background-size: cover;
+}
+
 #BackgroundColorButton {
   margin-top: 9px;
   margin-bottom: 2px;

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