incorporate toolkit winstripe changes until 2011-02-13

diff --git a/EarlyBlue/global/icons/information-tabmodal-64.png b/EarlyBlue/global/icons/information-tabmodal-64.png
deleted file mode 100644 (file)
index 8f8a2ee..0000000
Binary files a/EarlyBlue/global/icons/information-tabmodal-64.png and /dev/null differ

diff --git a/EarlyBlue/global/icons/question-tabmodal-64.png b/EarlyBlue/global/icons/question-tabmodal-64.png
deleted file mode 100644 (file)
index 460c96c..0000000
Binary files a/EarlyBlue/global/icons/question-tabmodal-64.png and /dev/null differ

diff --git a/EarlyBlue/global/tabprompts.css b/EarlyBlue/global/tabprompts.css
index 1773c328235f69a3ee1718a022a62055a5ec0348..7b762894b4f500a7455fe7a5f7cff1d8058f1153 100644 (file)
--- a/EarlyBlue/global/tabprompts.css
+++ b/EarlyBlue/global/tabprompts.css
@@ -1,29 +1,22 @@
 /* Tab Modal Prompt boxes */
 tabmodalprompt {
-  background-color: hsla(0,0%,97%,.15);
-  background-image: -moz-radial-gradient(center 40%, circle closest-side, hsla(0,0%,90%,.5), hsla(0,0%,90%,0));
+  background-color: hsla(0,0%,10%,.5);
+  font-family: sans-serif; /* use content font not system UI font */
 }
 
 .mainContainer {
-  padding: 20px;
   color: #000000;
   background-color: #CCD0DD;
+  background-clip: padding-box;
   border: 1px outset #CCD0DD;
 }
 
-.buttonContainer {
-  margin-top: 10px;
-}
-
-.info\.icon {
-  width: 64px !important;
-  height: 64px !important;
-}
-
-.alert-icon {
-  list-style-image: url("chrome://global/skin/icons/information-tabmodal-64.png") !important;
+.topContainer {
+  padding: 20px;
 }
 
-.question-icon {
-  list-style-image: url("chrome://global/skin/icons/question-tabmodal-64.png") !important;
+.buttonContainer {
+  padding: 12px 20px 15px;
+  background-color: #9999CC;
+  border-top: 1px solid #666699;
 }

diff --git a/EarlyBlue/global/webConsole.css b/EarlyBlue/global/webConsole.css
index d12e7d8d1dca275a344b71f3083f2185e581fea9..a468233dd6641ab5573c69ceb3846f6439afe018 100644 (file)
--- a/EarlyBlue/global/webConsole.css
+++ b/EarlyBlue/global/webConsole.css
@@ -62,14 +62,11 @@
 }
 
 .webconsole-msg-icon {
-  list-style-image: url(chrome://global/skin/icons/webconsole.png);
-  margin: 2px 3px;
-  width: 10px;
-  height: 10px;
-}
-
-.webconsole-msg-log > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  visibility: hidden;
+  list-style-image: url("chrome://global/skin/icons/webconsole.png");
+  -moz-image-region: rect(0, 1px, 0, 0);
+  margin: 3px 4px;
+  width: 8px;
+  height: 8px;
 }
 
 .hud-output-node div {
@@ -90,6 +87,14 @@
   -moz-margin-end: 6px;
 }
 
+.webconsole-msg-body-piece {
+  margin: 0;
+}
+
+.webconsole-msg-url {
+  margin: 0 6px;
+}
+
 .webconsole-location {
   margin-top: 0;
   margin-bottom: 0;
@@ -133,7 +138,7 @@
 
 /* Network styles */
 .webconsole-filter-button[category="net"] {
-  -moz-image-region: rect(0, 40px, 10px, 30px);
+  -moz-image-region: rect(0, 8px, 8px, 0);
 }
 
 .webconsole-msg-network > .webconsole-msg-icon-container {
@@ -141,12 +146,12 @@
 }
 
 .webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(0, 10px, 10px, 0);
+  -moz-image-region: rect(0, 16px, 8px, 8px);
 }
 
 /* CSS styles */
 .webconsole-filter-button[category="css"] {
-  -moz-image-region: rect(10px, 40px, 20px, 30px);
+  -moz-image-region: rect(8px, 8px, 16px, 0);
 }
 
 .webconsole-msg-cssparser > .webconsole-msg-icon-container {
@@ -154,16 +159,16 @@
 }
 
 .webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(10px, 10px, 20px, 0);
+  -moz-image-region: rect(8px, 16px, 16px, 8px);
 }
 
 .webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(10px, 20px, 20px, 10px);
+  -moz-image-region: rect(8px, 24px, 16px, 16px);
 }
 
 /* JS styles */
 .webconsole-filter-button[category="js"] {
-  -moz-image-region: rect(20px, 40px, 30px, 30px);
+  -moz-image-region: rect(16px, 8px, 24px, 0);
 }
 
 .webconsole-msg-exception > .webconsole-msg-icon-container {
@@ -171,16 +176,16 @@
 }
 
 .webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(20px, 10px, 30px, 0);
+  -moz-image-region: rect(16px, 16px, 24px, 8px);
 }
 
 .webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(20px, 20px, 30px, 10px);
+  -moz-image-region: rect(16px, 24px, 24px, 16px);
 }
 
 /* Web Developer styles */
 .webconsole-filter-button[category="webdev"] {
-  -moz-image-region: rect(30px, 40px, 40px, 30px);
+  -moz-image-region: rect(24px, 8px, 32px, 0);
 }
 
 .webconsole-msg-console > .webconsole-msg-icon-container {
@@ -189,15 +194,15 @@
 
 .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 {
-  -moz-image-region: rect(30px, 10px, 40px, 0);
+  -moz-image-region: rect(24px, 16px, 32px, 8px);
 }
 
 .webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(30px, 20px, 40px, 10px);
+  -moz-image-region: rect(24px, 24px, 32px, 16px);
 }
 
 .webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(30px, 30px, 40px, 20px);
+  -moz-image-region: rect(24px, 32px, 32px, 24px);
 }
 
 /* Input and output styles */
@@ -206,6 +211,14 @@
   border-left: solid #808080 6px;
 }
 
+.webconsole-msg-input > .webconsole-msg-icon-container > .webconsole-msg-icon {
+  -moz-image-region: rect(24px, 40px, 32px, 32px);
+}
+
+.webconsole-msg-output > .webconsole-msg-icon-container > .webconsole-msg-icon {
+  -moz-image-region: rect(24px, 48px, 32px, 40px);
+}
+
 .webconsole-close-button {
   border: none;
   padding: 3px;

diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css
index 992786d7d189b34e904d4add7e8889dce9a40f93..f668e7775f7f50b4c6501d82fd3de5865c44b7ea 100644 (file)
--- a/EarlyBlue/mozapps/extensions/extensions.css
+++ b/EarlyBlue/mozapps/extensions/extensions.css
@@ -217,6 +217,8 @@
 }
 
 .category[disabled] {
+  border-top: 0;
+  border-bottom: 0;
   height: 0;
   opacity: 0;
   -moz-transition-property: height, opacity;
@@ -402,7 +404,7 @@
 .icon-container {
   width: 48px;
   height: 48px;
-  margin: 22px 7px 7px 7px;
+  margin: 3px 7px;
 }
 
 .addon[active="false"] .icon {

diff --git a/LCARStrek/global/icons/information-tabmodal-64.png b/LCARStrek/global/icons/information-tabmodal-64.png
deleted file mode 100644 (file)
index 4602abf..0000000
Binary files a/LCARStrek/global/icons/information-tabmodal-64.png and /dev/null differ

diff --git a/LCARStrek/global/icons/question-tabmodal-64.png b/LCARStrek/global/icons/question-tabmodal-64.png
deleted file mode 100644 (file)
index 461e6e7..0000000
Binary files a/LCARStrek/global/icons/question-tabmodal-64.png and /dev/null differ

diff --git a/LCARStrek/global/tabprompts.css b/LCARStrek/global/tabprompts.css
index 107346f17e546ff96fe39e907e2143fc77d42d8d..b3c203e9d8ff31c12be77f77847efe66b1e5f03f 100644 (file)
--- a/LCARStrek/global/tabprompts.css
+++ b/LCARStrek/global/tabprompts.css
@@ -1,30 +1,23 @@
 /* Tab Modal Prompt boxes */
 tabmodalprompt {
-  background-color: hsla(0,0%,97%,.15);
-  background-image: -moz-radial-gradient(center 40%, circle closest-side, hsla(0,0%,90%,.5), hsla(0,0%,90%,0));
+  background-color: hsla(0,0%,10%,.5);
+  font-family: sans-serif; /* use content font not system UI font */
 }
 
 .mainContainer {
-  padding: 20px;
   color: #FF9F00;
   background-color: #000000;
+  background-clip: padding-box;
   border-radius: 8px;
   border: 1px solid #9C9CFF;
 }
 
-.buttonContainer {
-  margin-top: 10px;
-}
-
-.info\.icon {
-  width: 64px !important;
-  height: 64px !important;
-}
-
-.alert-icon {
-  list-style-image: url("chrome://global/skin/icons/information-tabmodal-64.png") !important;
+.topContainer {
+  padding: 20px;
 }
 
-.question-icon {
-  list-style-image: url("chrome://global/skin/icons/question-tabmodal-64.png") !important;
+.buttonContainer {
+  padding: 12px 20px 15px;
+  background-color: #E7ADE7;
+  border-top: 1px solid #9C9CFF;
 }

diff --git a/LCARStrek/global/webConsole.css b/LCARStrek/global/webConsole.css
index a4978b4a2864519f1adc29b3e7d54b94742b0ab5..88bcc2310b42371868a2a68bca667d601a0454ed 100644 (file)
--- a/LCARStrek/global/webConsole.css
+++ b/LCARStrek/global/webConsole.css
@@ -63,13 +63,10 @@
 
 .webconsole-msg-icon {
   list-style-image: url(chrome://global/skin/icons/webconsole.png);
-  margin: 2px 3px;
-  width: 10px;
-  height: 10px;
-}
-
-.webconsole-msg-log > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  visibility: hidden;
+  -moz-image-region: rect(0, 1px, 0, 0);
+  margin: 3px 4px;
+  width: 8px;
+  height: 8px;
 }
 
 .hud-output-node div {
@@ -90,6 +87,14 @@
   -moz-margin-end: 6px;
 }
 
+.webconsole-msg-body-piece {
+  margin: 0;
+}
+
+.webconsole-msg-url {
+  margin: 0 6px;
+}
+
 .webconsole-location {
   margin-top: 0;
   margin-bottom: 0;
@@ -126,13 +131,14 @@
   display: none;
 }
 
+.webconsole-filter-button > .toolbarbutton-menubutton-button {
   -moz-box-orient: horizontal;
   list-style-image: url("chrome://global/skin/icons/webconsole.png");
 }
 
 /* Network styles */
 .webconsole-filter-button[category="net"] {
-  -moz-image-region: rect(0, 40px, 10px, 30px);
+  -moz-image-region: rect(0, 8px, 8px, 0);
 }
 
 .webconsole-msg-network > .webconsole-msg-icon-container {
@@ -140,12 +146,12 @@
 }
 
 .webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(0, 10px, 10px, 0);
+  -moz-image-region: rect(0, 16px, 8px, 8px);
 }
 
 /* CSS styles */
 .webconsole-filter-button[category="css"] {
-  -moz-image-region: rect(10px, 40px, 20px, 30px);
+  -moz-image-region: rect(8px, 8px, 16px, 0);
 }
 
 .webconsole-msg-cssparser > .webconsole-msg-icon-container {
@@ -153,16 +159,16 @@
 }
 
 .webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(10px, 10px, 20px, 0);
+  -moz-image-region: rect(8px, 16px, 16px, 8px);
 }
 
 .webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(10px, 20px, 20px, 10px);
+  -moz-image-region: rect(8px, 24px, 16px, 16px);
 }
 
 /* JS styles */
 .webconsole-filter-button[category="js"] {
-  -moz-image-region: rect(20px, 40px, 30px, 30px);
+  -moz-image-region: rect(16px, 8px, 24px, 0);
 }
 
 .webconsole-msg-exception > .webconsole-msg-icon-container {
@@ -170,16 +176,16 @@
 }
 
 .webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(20px, 10px, 30px, 0);
+  -moz-image-region: rect(16px, 16px, 24px, 8px);
 }
 
 .webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(20px, 20px, 30px, 10px);
+  -moz-image-region: rect(16px, 24px, 24px, 16px);
 }
 
 /* Web Developer styles */
 .webconsole-filter-button[category="webdev"] {
-  -moz-image-region: rect(30px, 40px, 40px, 30px);
+  -moz-image-region: rect(24px, 8px, 32px, 0);
 }
 
 .webconsole-msg-console > .webconsole-msg-icon-container {
@@ -188,15 +194,15 @@
 
 .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 {
-  -moz-image-region: rect(30px, 10px, 40px, 0);
+  -moz-image-region: rect(24px, 16px, 32px, 8px);
 }
 
 .webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(30px, 20px, 40px, 10px);
+  -moz-image-region: rect(24px, 24px, 32px, 16px);
 }
 
 .webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
-  -moz-image-region: rect(30px, 30px, 40px, 20px);
+  -moz-image-region: rect(24px, 32px, 32px, 24px);
 }
 
 /* Input and output styles */
@@ -205,6 +211,14 @@
   border-left: solid #808080 6px;
 }
 
+.webconsole-msg-input > .webconsole-msg-icon-container > .webconsole-msg-icon {
+  -moz-image-region: rect(24px, 40px, 32px, 32px);
+}
+
+.webconsole-msg-output > .webconsole-msg-icon-container > .webconsole-msg-icon {
+  -moz-image-region: rect(24px, 48px, 32px, 40px);
+}
+
 .webconsole-close-button {
   border: none;
   padding: 3px;

diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css
index 8c883845791b4fefcf0520b1b91aae1f98978701..1ecdb250b00fcba142ad9ab025224f1b99d72d2a 100644 (file)
--- a/LCARStrek/mozapps/extensions/extensions.css
+++ b/LCARStrek/mozapps/extensions/extensions.css
@@ -227,6 +227,8 @@
 }
 
 .category[disabled] {
+  border-top: 0;
+  border-bottom: 0;
   height: 0;
   opacity: 0;
   -moz-transition-property: height, opacity;
@@ -433,7 +435,7 @@
 .icon-container {
   width: 48px;
   height: 48px;
-  margin: 22px 7px 7px 7px;
+  margin: 3px 7px;
 }
 
 .icon {