update both themes for changes in toolkit winstripe for Mozilla 10 platform

diff --git a/EarlyBlue/global/inContentUI.css b/EarlyBlue/global/inContentUI.css
index 7b75d425df9ee63313052b87bc9f57700082babf..fbe5ce19852d1852dfe3347540a6425d07fec7fc 100644 (file)
--- a/EarlyBlue/global/inContentUI.css
+++ b/EarlyBlue/global/inContentUI.css
@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Blair McBride <bmcbride@mozilla.com>
+ *   Philipp von Weitershausen <philipp@weitershausen.de>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -35,17 +36,26 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * The default namespace for this file is XUL. Be sure to prefix rules that
+ * are applicable to both XUL and HTML with '*|'.
+ */
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
 
 /* Page background */
-:root {
+*|*:root {
   background-color: #CCD0DD;
   color: #000000;
   margin: 20px;
 }
 
+html|html {
+  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+}
+
 /* Content */
-.main-content {
+*|*.main-content {
   /* Needed to allow the radius to clip the inner content, see bug 595656 */
   /* Disabled because of bug 623615
   overflow: hidden;

diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css
index 992f406d44d02be05b3a8e8352c09aad71327b40..00faa807028be834e9200bb55398ad8e4be7358c 100644 (file)
--- a/EarlyBlue/global/media/videocontrols.css
+++ b/EarlyBlue/global/media/videocontrols.css
@@ -1,4 +1,5 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
 
 .controlBar {
   height: 28px;
@@ -188,6 +189,31 @@
   background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center;
 }
 
+/* Statistics formatting */
+html|*.statsDiv {
+  position: relative;
+}
+html|td {
+  height: 1em;
+  max-height: 1em;
+  padding: 0 2px;
+}
+html|table {
+  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  font-size: 11px;
+  color: white;
+  text-shadow:
+    -1px -1px 0 #000,
+    1px -1px 0 #000,
+    -1px 1px 0 #000,
+    1px 1px 0 #000;
+  min-width: 100%;
+  background: rgba(68,68,68,.7);
+  table-layout: fixed;
+  border-collapse: collapse;
+  position: absolute;
+}
+
 /* CSS Transitions */
 .controlBar:not([immediate]) {
   -moz-transition-property: opacity;

diff --git a/EarlyBlue/mozapps/extensions/about.css b/EarlyBlue/mozapps/extensions/about.css
index 9a19ccac3a85c415dac4be51a39085ae5942a9f6..88dfc32b9b3eb2f72d06027d2de0f585f3d4a583 100644 (file)
--- a/EarlyBlue/mozapps/extensions/about.css
+++ b/EarlyBlue/mozapps/extensions/about.css
@@ -33,6 +33,10 @@
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
 
+#genericAbout[addontype="dictionary"] #extensionIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
 #extensionName {
   font-size: large;
   font-weight: bold;

diff --git a/EarlyBlue/mozapps/extensions/category-dictionaries.png b/EarlyBlue/mozapps/extensions/category-dictionaries.png
new file mode 100644 (file)
index 0000000..bd42dbc
Binary files /dev/null and b/EarlyBlue/mozapps/extensions/category-dictionaries.png differ

diff --git a/EarlyBlue/mozapps/extensions/dictionaryGeneric-16.png b/EarlyBlue/mozapps/extensions/dictionaryGeneric-16.png
new file mode 100644 (file)
index 0000000..ba7715c
Binary files /dev/null and b/EarlyBlue/mozapps/extensions/dictionaryGeneric-16.png differ

diff --git a/EarlyBlue/mozapps/extensions/dictionaryGeneric.png b/EarlyBlue/mozapps/extensions/dictionaryGeneric.png
new file mode 100644 (file)
index 0000000..4c6e526
Binary files /dev/null and b/EarlyBlue/mozapps/extensions/dictionaryGeneric.png differ

diff --git a/EarlyBlue/mozapps/extensions/eula.css b/EarlyBlue/mozapps/extensions/eula.css
index f112eee3cf46b3581349b82a1df6f1cdb8e3931f..22a14b2806c2ddbac22aa6febf5ab1192aab7f10 100644 (file)
--- a/EarlyBlue/mozapps/extensions/eula.css
+++ b/EarlyBlue/mozapps/extensions/eula.css
@@ -1,3 +1,30 @@
+#icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  max-width: 48px;
+  max-height: 48px;
+  -moz-margin-end: 6px;
+}
+
+#eula-dialog[addontype="theme"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+#eula-dialog[addontype="locale"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+#eula-dialog[addontype="plugin"] #icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
+#eula-dialog[addontype="dictionary"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
+#heading-container {
+  -moz-box-align: center;
+}
+
 #heading {
   font-size: 120%;
 }

diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css
index e2f13a3a853a21a039a184165ae608e2487578f9..9f5e40f2a6a27a5e18d3c6f4a5aeb59a79b4df0e 100644 (file)
--- a/EarlyBlue/mozapps/extensions/extensions.css
+++ b/EarlyBlue/mozapps/extensions/extensions.css
@@ -286,6 +286,9 @@
 #category-plugin > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
 }
+#category-dictionary > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
+}
 #category-availableUpdates > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
 }
@@ -461,6 +464,10 @@
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
 
+.addon-view[type="dictionary"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
 .name-container {
   font-size: 150%;
   font-weight: bold;

diff --git a/EarlyBlue/mozapps/extensions/newaddon.css b/EarlyBlue/mozapps/extensions/newaddon.css
index 97f6ed9cb51d2280618c8d87120838dd91079cdd..4493d14fb10f62e94fb9961022df3e34877cf0d9 100644 (file)
--- a/EarlyBlue/mozapps/extensions/newaddon.css
+++ b/EarlyBlue/mozapps/extensions/newaddon.css
@@ -83,6 +83,10 @@
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
 
+.addon-info[type="dictionary"] #icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/dictionaryGeneric.png");
+}
+
 #name {
   font-size: 130%;
 }

diff --git a/EarlyBlue/mozapps/extensions/selectAddons.css b/EarlyBlue/mozapps/extensions/selectAddons.css
index 9ab50f7ee9dce9687b5542d9ba19ee8929c35849..97840879f420faf0a1d0ecbc330f2cf1687aa2ee 100644 (file)
--- a/EarlyBlue/mozapps/extensions/selectAddons.css
+++ b/EarlyBlue/mozapps/extensions/selectAddons.css
@@ -167,6 +167,10 @@
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
 }
 
+.addon-icon[type="dictionary"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric-16.png");
+}
+
 .action-list {
   margin-top: 10px;
   -moz-margin-start: 5em;

diff --git a/EarlyBlue/mozapps/plugins/pluginProblem.css b/EarlyBlue/mozapps/plugins/pluginProblem.css
index 1ecac655110b772d4f51d24b98d8723c6187125d..e5efea317d5eb03658dbd6e5a74e1837115f8fee 100644 (file)
--- a/EarlyBlue/mozapps/plugins/pluginProblem.css
+++ b/EarlyBlue/mozapps/plugins/pluginProblem.css
@@ -29,6 +29,9 @@ html|a {
 :-moz-type-unsupported .icon[status="ready"] {
   background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png");
 }
+:-moz-handler-clicktoplay .icon {
+  background-image: url("chrome://mozapps/skin/plugins/contentPluginMissing.png");
+}
 :-moz-handler-disabled .icon {
   background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png");
 }

diff --git a/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css b/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css
index 1c2b4290cb67bd80460358a27a43d99f4f073852..0c83ab4c5134dccaed812c46d2937b14f6d839c4 100644 (file)
--- a/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css
+++ b/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css
@@ -81,3 +81,7 @@ installitem[type="locale"] .xpinstallItemIcon {
 installitem[type="plugin"] .xpinstallItemIcon {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
+
+installitem[type="dictionary"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}

diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css
index 63efbbcdca5b2c43c87855af06337b8dfb7eb2e8..831f3472283e2758e4e667b1525db3528a8866f3 100644 (file)
--- a/LCARStrek/browser/searchbar.css
+++ b/LCARStrek/browser/searchbar.css
@@ -30,7 +30,7 @@
   border: none;
 }
 
-.searchbar-engine-button["open=true"] {
+.searchbar-engine-button[open="true"] {
   background-color: #FF9F00;
 }
 

diff --git a/LCARStrek/global/findBar.css b/LCARStrek/global/findBar.css
index 746038624e98f391d388c7a2c646be751baf298c..b31fbd810976da662c44c820ef1d46042cb641f6 100644 (file)
--- a/LCARStrek/global/findBar.css
+++ b/LCARStrek/global/findBar.css
@@ -9,8 +9,8 @@
 }
 
 findbar {
-  border-top: 1px solid #000000;
-  border-bottom: 1px solid transparent;
+  border-top: 3px solid #000000;
+  border-bottom: none;
   min-width: 1px;
 }
 

diff --git a/LCARStrek/global/inContentUI.css b/LCARStrek/global/inContentUI.css
index aa5d88932eebaad73360f108ee6f16a7dedded66..3af3fd738bae5d44ec85fed5392ad2e150fe0d7f 100644 (file)
--- a/LCARStrek/global/inContentUI.css
+++ b/LCARStrek/global/inContentUI.css
@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Blair McBride <bmcbride@mozilla.com>
+ *   Philipp von Weitershausen <philipp@weitershausen.de>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -35,17 +36,26 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/*
+ * The default namespace for this file is XUL. Be sure to prefix rules that
+ * are applicable to both XUL and HTML with '*|'.
+ */
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
 
 /* Page background */
-:root {
+*|*:root {
   background-color: #000000;
   color: #FF9F00;
   margin: 20px;
 }
 
+html|html {
+  font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+}
+
 /* Content */
-.main-content {
+*|*.main-content {
   /* Needed to allow the radius to clip the inner content, see bug 595656 */
   /* Disabled because of bug 623615
   overflow: hidden;

diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css
index 27d9cd3bdfd0c8566c980cf54201eebceb13561c..54e3a9349d057e7e9c0ae1ed889acf168c13cacd 100644 (file)
--- a/LCARStrek/global/media/videocontrols.css
+++ b/LCARStrek/global/media/videocontrols.css
@@ -1,4 +1,5 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
 
 .controlBar {
   height: 28px;
@@ -215,6 +216,31 @@
   background: url("chrome://global/skin/icons/alert-error.gif") no-repeat center;
 }
 
+/* Statistics formatting */
+html|*.statsDiv {
+  position: relative;
+}
+html|td {
+  height: 1em;
+  max-height: 1em;
+  padding: 0 2px;
+}
+html|table {
+  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
+  font-size: 11px;
+  color: white;
+  text-shadow:
+    -1px -1px 0 #000,
+    1px -1px 0 #000,
+    -1px 1px 0 #000,
+    1px 1px 0 #000;
+  min-width: 100%;
+  background: rgba(68,68,111,.7);
+  table-layout: fixed;
+  border-collapse: collapse;
+  position: absolute;
+}
+
 /* CSS Transitions */
 .controlBar:not([immediate]) {
   -moz-transition-property: opacity;

diff --git a/LCARStrek/mozapps/extensions/about.css b/LCARStrek/mozapps/extensions/about.css
index 803d8accdbcbec9c00ab69246c4f52130f1735fa..0d454beaa4de5cadbf153aaff18cb4fb627db6a3 100644 (file)
--- a/LCARStrek/mozapps/extensions/about.css
+++ b/LCARStrek/mozapps/extensions/about.css
@@ -33,6 +33,10 @@
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
 
+#genericAbout[addontype="dictionary"] #extensionIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
 #extensionName {
   font-size: large;
   font-weight: bold;

diff --git a/LCARStrek/mozapps/extensions/eula.css b/LCARStrek/mozapps/extensions/eula.css
index 2250f69908887ff8b43caebc1c4dbe5c2315bbbb..c996546007fcc7765de3d4bd3713419b224cc178 100644 (file)
--- a/LCARStrek/mozapps/extensions/eula.css
+++ b/LCARStrek/mozapps/extensions/eula.css
@@ -1,3 +1,30 @@
+#icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  max-width: 48px;
+  max-height: 48px;
+  -moz-margin-end: 6px;
+}
+
+#eula-dialog[addontype="theme"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+#eula-dialog[addontype="locale"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+#eula-dialog[addontype="plugin"] #icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
+#eula-dialog[addontype="dictionary"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
+#heading-container {
+  -moz-box-align: center;
+}
+
 #heading {
   font-size: 120%;
 }

diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css
index 03efde1bf7693bc153bdaea3cc862815754a275a..24f925b4485e7b525724d7fc97a9354fec7c1eb0 100644 (file)
--- a/LCARStrek/mozapps/extensions/extensions.css
+++ b/LCARStrek/mozapps/extensions/extensions.css
@@ -298,6 +298,9 @@
 #category-plugin > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
 }
+#category-dictionary > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
+}
 #category-availableUpdates > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
 }
@@ -494,6 +497,10 @@
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
 
+.addon-view[type="dictionary"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
 .name-container {
   font-size: 150%;
   font-weight: bold;

diff --git a/LCARStrek/mozapps/extensions/newaddon.css b/LCARStrek/mozapps/extensions/newaddon.css
index 08066ebf0a8369e18e57dd8ba57ad09a3732936f..d85e6f2bc328b548ab2380cc29f36306bc86cdf8 100644 (file)
--- a/LCARStrek/mozapps/extensions/newaddon.css
+++ b/LCARStrek/mozapps/extensions/newaddon.css
@@ -83,6 +83,10 @@
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
 
+.addon-info[type="dictionary"] #icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/dictionaryGeneric.png");
+}
+
 #name {
   font-size: 130%;
 }

diff --git a/LCARStrek/mozapps/extensions/selectAddons.css b/LCARStrek/mozapps/extensions/selectAddons.css
index 7beb95c8435565f01f0179202de53ef804a8ca07..59922e0dbe10ed4678d220c19c792c89dcea0695 100644 (file)
--- a/LCARStrek/mozapps/extensions/selectAddons.css
+++ b/LCARStrek/mozapps/extensions/selectAddons.css
@@ -168,6 +168,10 @@
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
 }
 
+.addon-icon[type="dictionary"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric-16.png");
+}
+
 .action-list {
   margin-top: 10px;
   -moz-margin-start: 5em;

diff --git a/LCARStrek/mozapps/plugins/pluginProblem.css b/LCARStrek/mozapps/plugins/pluginProblem.css
index 83f75ceab3258e960c09a29c7b90b44e483d3ca5..98e325b2595fc027be6ab097c440310c0614e31a 100644 (file)
--- a/LCARStrek/mozapps/plugins/pluginProblem.css
+++ b/LCARStrek/mozapps/plugins/pluginProblem.css
@@ -29,6 +29,9 @@ html|a {
 :-moz-type-unsupported .icon[status="ready"] {
   background-image: url("chrome://mozapps/skin/plugins/contentPluginDownload.png");
 }
+:-moz-handler-clicktoplay .icon {
+  background-image: url("chrome://mozapps/skin/plugins/contentPluginMissing.png");
+}
 :-moz-handler-disabled .icon {
   background-image: url("chrome://mozapps/skin/plugins/contentPluginDisabled.png");
 }

diff --git a/LCARStrek/mozapps/xpinstall/xpinstallConfirm.css b/LCARStrek/mozapps/xpinstall/xpinstallConfirm.css
index 3103cced61d4a9fa183e2c40f1e5497765c99c7e..5f4b579d1de3e03cf6333a3f05c24da4e7a95ede 100644 (file)
--- a/LCARStrek/mozapps/xpinstall/xpinstallConfirm.css
+++ b/LCARStrek/mozapps/xpinstall/xpinstallConfirm.css
@@ -82,3 +82,7 @@ installitem[type="locale"] .xpinstallItemIcon {
 installitem[type="plugin"] .xpinstallItemIcon {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
+
+installitem[type="dictionary"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}