From a42b27e724dddda702dce11ff93b21f739ba2b47 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <robert@notebook.box.kairo.at>
Date: Sun, 4 Sep 2011 21:14:25 +0200
Subject: [PATCH] first steps of adopting both themes to toolkit winstripe
 changes between Mozilla 6 and 7 - leaving out extensions stuff for the moment

---
 EarlyBlue/global/notification.css |  2 +-
 EarlyBlue/global/webConsole.css   | 28 ++++++++++++++++------------
 EarlyBlue/install.rdf             |  4 ++--
 LCARStrek/global/notification.css |  2 +-
 LCARStrek/global/webConsole.css   | 30 +++++++++++++++++-------------
 LCARStrek/install.rdf             |  6 +++---
 origdiff                          | 16 ++++++++--------
 7 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/EarlyBlue/global/notification.css b/EarlyBlue/global/notification.css
index 351a6bb9..08d54c30 100644
--- a/EarlyBlue/global/notification.css
+++ b/EarlyBlue/global/notification.css
@@ -51,7 +51,7 @@ notification[type="critical"] .messageImage {
 /* Popup notification */
 
 .popup-notification-description {
-  max-width: 248px;
+  max-width: 24em;
 }
 
 .popup-notification-button-container {
diff --git a/EarlyBlue/global/webConsole.css b/EarlyBlue/global/webConsole.css
index 8ba4ff74..1aa35a5d 100644
--- a/EarlyBlue/global/webConsole.css
+++ b/EarlyBlue/global/webConsole.css
@@ -61,9 +61,12 @@
   margin-bottom: 0;
 }
 
-.webconsole-msg-icon {
+.hud-msg-node {
   list-style-image: url("chrome://global/skin/icons/webconsole.png");
   -moz-image-region: rect(0, 1px, 0, 0);
+}
+
+.webconsole-msg-icon {
   margin: 3px 4px;
   width: 8px;
   height: 8px;
@@ -85,6 +88,7 @@
   margin-bottom: 3px;
   -moz-margin-start: 3px;
   -moz-margin-end: 6px;
+  white-space: pre-wrap;
 }
 
 .webconsole-msg-body-piece {
@@ -164,7 +168,7 @@
   -moz-border-start: solid #000 6px;
 }
 
-.webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-network.webconsole-msg-error {
   -moz-image-region: rect(0, 16px, 8px, 8px);
 }
 
@@ -177,11 +181,11 @@
   -moz-border-start: solid #00b6f0 6px;
 }
 
-.webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-error {
   -moz-image-region: rect(8px, 16px, 16px, 8px);
 }
 
-.webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-warn {
   -moz-image-region: rect(8px, 24px, 16px, 16px);
 }
 
@@ -194,11 +198,11 @@
   -moz-border-start: solid #fb9500 6px;
 }
 
-.webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-error {
   -moz-image-region: rect(16px, 16px, 24px, 8px);
 }
 
-.webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-warn {
   -moz-image-region: rect(16px, 24px, 24px, 16px);
 }
 
@@ -211,16 +215,16 @@
   -moz-border-start: solid #cbcbcb 6px;
 }
 
-.webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon,
-.webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-error,
+.webconsole-msg-output.webconsole-msg-error {
   -moz-image-region: rect(24px, 16px, 32px, 8px);
 }
 
-.webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-warn {
   -moz-image-region: rect(24px, 24px, 32px, 16px);
 }
 
-.webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-info {
   -moz-image-region: rect(24px, 32px, 32px, 24px);
 }
 
@@ -230,11 +234,11 @@
   border-left: solid #808080 6px;
 }
 
-.webconsole-msg-input > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-input {
   -moz-image-region: rect(24px, 40px, 32px, 32px);
 }
 
-.webconsole-msg-output > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-output {
   -moz-image-region: rect(24px, 48px, 32px, 40px);
 }
 
diff --git a/EarlyBlue/install.rdf b/EarlyBlue/install.rdf
index 7533769d..87b6fdb6 100644
--- a/EarlyBlue/install.rdf
+++ b/EarlyBlue/install.rdf
@@ -5,13 +5,13 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>EarlyBlue@kairo.at</em:id>
-    <em:version>2.3</em:version>
+    <em:version>2.4</em:version>
 
     <!-- SeaMonkey -->
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.3</em:minVersion>
+        <em:minVersion>2.4</em:minVersion>
         <em:maxVersion>2.6a1</em:maxVersion>
       </Description>
     </em:targetApplication>
diff --git a/LCARStrek/global/notification.css b/LCARStrek/global/notification.css
index 74d8fef9..bf7b4dc5 100644
--- a/LCARStrek/global/notification.css
+++ b/LCARStrek/global/notification.css
@@ -58,7 +58,7 @@ notification[type="critical"] .messageImage {
 /* Popup notification */
 
 .popup-notification-description {
-  max-width: 248px;
+  max-width: 24em;
 }
 
 .popup-notification-button-container {
diff --git a/LCARStrek/global/webConsole.css b/LCARStrek/global/webConsole.css
index b5f125f5..ad09e97a 100644
--- a/LCARStrek/global/webConsole.css
+++ b/LCARStrek/global/webConsole.css
@@ -61,9 +61,12 @@
   margin-bottom: 0;
 }
 
-.webconsole-msg-icon {
-  list-style-image: url(chrome://global/skin/icons/webconsole.png);
+.hud-msg-node {
+  list-style-image: url("chrome://global/skin/icons/webconsole.png");
   -moz-image-region: rect(0, 1px, 0, 0);
+}
+
+.webconsole-msg-icon {
   margin: 3px 4px;
   width: 8px;
   height: 8px;
@@ -85,6 +88,7 @@
   margin-bottom: 3px;
   -moz-margin-start: 3px;
   -moz-margin-end: 6px;
+  white-space: pre-wrap;
 }
 
 .webconsole-msg-body-piece {
@@ -164,7 +168,7 @@
   -moz-border-start: solid #000 6px;
 }
 
-.webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-network.webconsole-msg-error {
   -moz-image-region: rect(0, 16px, 8px, 8px);
 }
 
@@ -177,11 +181,11 @@
   -moz-border-start: solid #00b6f0 6px;
 }
 
-.webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-error {
   -moz-image-region: rect(8px, 16px, 16px, 8px);
 }
 
-.webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-cssparser.webconsole-msg-warn {
   -moz-image-region: rect(8px, 24px, 16px, 16px);
 }
 
@@ -194,11 +198,11 @@
   -moz-border-start: solid #fb9500 6px;
 }
 
-.webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-error {
   -moz-image-region: rect(16px, 16px, 24px, 8px);
 }
 
-.webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-exception.webconsole-msg-warn {
   -moz-image-region: rect(16px, 24px, 24px, 16px);
 }
 
@@ -211,16 +215,16 @@
   -moz-border-start: solid #cbcbcb 6px;
 }
 
-.webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon,
-.webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-error,
+.webconsole-msg-output.webconsole-msg-error {
   -moz-image-region: rect(24px, 16px, 32px, 8px);
 }
 
-.webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-warn {
   -moz-image-region: rect(24px, 24px, 32px, 16px);
 }
 
-.webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-console.webconsole-msg-info {
   -moz-image-region: rect(24px, 32px, 32px, 24px);
 }
 
@@ -230,11 +234,11 @@
   border-left: solid #808080 6px;
 }
 
-.webconsole-msg-input > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-input {
   -moz-image-region: rect(24px, 40px, 32px, 32px);
 }
 
-.webconsole-msg-output > .webconsole-msg-icon-container > .webconsole-msg-icon {
+.webconsole-msg-output {
   -moz-image-region: rect(24px, 48px, 32px, 40px);
 }
 
diff --git a/LCARStrek/install.rdf b/LCARStrek/install.rdf
index 3b1c3e39..3eafcb9b 100644
--- a/LCARStrek/install.rdf
+++ b/LCARStrek/install.rdf
@@ -5,13 +5,13 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>LCARStrek@kairo.at</em:id>
-    <em:version>2.3</em:version>
+    <em:version>2.4</em:version>
 
     <!-- SeaMonkey -->
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.3</em:minVersion>
+        <em:minVersion>2.4</em:minVersion>
         <em:maxVersion>2.6a1</em:maxVersion>
       </Description>
     </em:targetApplication>
@@ -19,7 +19,7 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>6.0</em:minVersion>
+        <em:minVersion>7.0</em:minVersion>
         <em:maxVersion>9.0a1</em:maxVersion>
       </Description>
     </em:targetApplication>
diff --git a/origdiff b/origdiff
index adbfe841..bc411db4 100755
--- a/origdiff
+++ b/origdiff
@@ -6,15 +6,15 @@ SCRIPT_DIR=$(pwd)
 
 # ============ vars specific to the versions ==============
 
-NAME_PRE=5
-NAME_POST=6
+NAME_PRE=6
+NAME_POST=7
 
-TAG_PRE_COMM=BETA_5_END
-TAG_POST_COMM=BETA_6_END
-TAG_PRE_MOZ=FIREFOX_BETA_5_END
-TAG_POST_MOZ=FIREFOX_BETA_6
-TAG_PRE_EXT=SEAMONKEY_2_2_RELEASE
-TAG_POST_EXT=SEAMONKEY_2_3_RELEASE
+TAG_PRE_COMM=BETA_6_END
+TAG_POST_COMM=tip #BETA_7_END
+TAG_PRE_MOZ=FIREFOX_BETA_6
+TAG_POST_MOZ=tip #FIREFOX_BETA_7
+TAG_PRE_EXT=SEAMONKEY_2_3_RELEASE
+TAG_POST_EXT=tip #SEAMONKEY_2_4_RELEASE
 
 # ===================== process repos =====================
 
-- 
2.43.0