update both themes for toolkit winstripe trunk changes up to 2010-02-21

diff --git a/EarlyBlue/browser/browser.xml b/EarlyBlue/browser/browser.xml
index be92c1110584bbc306c3dfbfcb7288ee592129d5..116fb1be09504fc93eb2170a34ff38f58d14dba1 100644 (file)
--- a/EarlyBlue/browser/browser.xml
+++ b/EarlyBlue/browser/browser.xml
@@ -16,7 +16,7 @@
         <xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
              anonid="button" allowevents="true"
              xbl:inherits="disabled,image,label,crop,accesskey,command,
-                           buttonover,buttondown,align,dir,pack,orient"/>
+                           align,dir,pack,orient"/>
         <xul:dropmarker type="menu-button" xbl:inherits="open,disabled"
                         class="toolbarbutton-menubutton-dropmarker"/>
       </xul:stack>

diff --git a/EarlyBlue/global/about.css b/EarlyBlue/global/about.css
index c626cdcc8437368c29e1dd2d1485363f7fce1dc2..05a17f32a609cdade119d117fb875303d736f8d9 100644 (file)
--- a/EarlyBlue/global/about.css
+++ b/EarlyBlue/global/about.css
@@ -54,3 +54,8 @@ ul > li {
 th, td {
   padding: 0 5px;
 }
+
+.columns {
+  -moz-column-width: 20em;
+  -moz-column-gap: 3em;
+}

diff --git a/EarlyBlue/global/appPicker.css b/EarlyBlue/global/appPicker.css
index 561333ee500a99c1c43a030c3d60077ae66fc9b0..ca8352daea259bdc2ccef5adcfddf8212ecde93d 100644 (file)
--- a/EarlyBlue/global/appPicker.css
+++ b/EarlyBlue/global/appPicker.css
@@ -9,12 +9,11 @@
 
 #content-icon,
 .listcell-icon {
-  height: 32px;
+  margin: 5px;
   width: 32px;
+  height: 32px;
 }
 
-#content-icon,
-.listcell-icon,
 .listcell-label {
-  margin: 5px;
+  padding: 5px;
 }

diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css
index 5a2642b80454fade95af1470a20cf0c70e1acac2..6072ec3f5a3dbb53bdd5a499daf5650a0a18b68c 100644 (file)
--- a/EarlyBlue/global/button.css
+++ b/EarlyBlue/global/button.css
@@ -49,6 +49,7 @@ button {
   border: 1px outset #CCD0DD;
   background-color: #CCD0DD;
   color: #000000;
+  text-shadow: none;
 }
 
 .button-box {

diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css
index 6b8cea4f7283e51882b7848715f27dbcbe8989bc..990825b608a84facb792ce5b6787082108b87f14 100644 (file)
--- a/EarlyBlue/global/global.css
+++ b/EarlyBlue/global/global.css
@@ -141,6 +141,12 @@ statusbarpanel {
   padding: 0px 1px;
 }
 
+statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme {
+  -moz-appearance: none;
+  border-top-style: none;
+  border-bottom-style: none;
+  -moz-border-start-style: none;
+}
 
 .statusbar-resizerpanel {
   -moz-box-align: end;

diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css
index 6f3d49f4c8830522a66de6616eb88924a09a5519..6ab4689390b70a3dfa164c2852379115c7f489ed 100644 (file)
--- a/EarlyBlue/global/menulist.css
+++ b/EarlyBlue/global/menulist.css
@@ -49,6 +49,7 @@ menulist {
   border: 1px inset #CCD0DD;
   background-color: #CCCCCC;
   color: #000000;
+  text-shadow: none;
 }
 
 .menulist-label-box {

diff --git a/EarlyBlue/global/toolbarbutton.css b/EarlyBlue/global/toolbarbutton.css
index 4cd992741b9ae13a29c26484f5f537e9c370878e..52926c70d6e912ddccfdaa1fedfa906f4b1b0752 100644 (file)
--- a/EarlyBlue/global/toolbarbutton.css
+++ b/EarlyBlue/global/toolbarbutton.css
@@ -81,8 +81,7 @@ toolbarbutton.toolbarbutton-menubutton-button[open="true"] {
 }
 */
 
-toolbarbutton:hover,
-toolbarbutton[buttonover="true"] {
+toolbarbutton:hover {
   border: 1px outset #CCD0DD;
 }
 

diff --git a/EarlyBlue/mozapps/plugins/missingPlugin.css b/EarlyBlue/mozapps/plugins/missingPlugin.css
deleted file mode 100644 (file)
index 44c63d2..0000000
--- a/EarlyBlue/mozapps/plugins/missingPlugin.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This file's style only applies to broken objects, not the rest
- * of the page.
- */
-
-@namespace html url(http://www.w3.org/1999/xhtml);
-
-html|object:not([width]), html|object[width=""],
-html|embed:not([width]), html|embed[width=""],
-html|applet:not([width]), html|applet[width=""] {
-  width: 240px;
-}
-
-html|object:not([height]), html|object[height=""],
-html|embed:not([height]), html|embed[height=""],
-html|applet:not([height]), html|applet[height=""] {
-  height: 200px;
-}
-
-html|object > *|*,
-html|embed > *|*,
-html|applet > *|* {
-  width: inherit;
-  height: inherit;
-}
-
-html|a, html|div {
-  text-align: -moz-center;
-  display: inline-block;
-  /* overflow:hidden makes baseline vertical-alignment act like plugins */
-  overflow: hidden;
-  vertical-align: inherit;
-  border: 1px outset;
-  padding: 5px;
-  font-size: 12px;
-  font-family: sans-serif;
-  background: #FFFFFF;
-  -moz-user-select: none;
-  text-decoration: none;
-  color: #000000;
-}
-
-vbox {
-  width: inherit;
-  height: inherit;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-}
-
-#missingPluginPlaceholder {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-#disabledPluginPlaceholder {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginDisabled.png");
-}
-
-#blockedPluginPlaceholder {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked.png");
-}
-
-#missingPluginPlaceholder,
-#disabledPluginPlaceholder,
-#blockedPluginPlaceholder {
-  display: block;
-  border: 0px;
-  width: 32px;
-  height: 32px;
-}

diff --git a/EarlyBlue/mozapps/plugins/pluginCrashed.png b/EarlyBlue/mozapps/plugins/pluginCrashed.png
new file mode 100644 (file)
index 0000000..e3129a5
Binary files /dev/null and b/EarlyBlue/mozapps/plugins/pluginCrashed.png differ

diff --git a/EarlyBlue/mozapps/plugins/pluginHelp-16.png b/EarlyBlue/mozapps/plugins/pluginHelp-16.png
new file mode 100644 (file)
index 0000000..6d35a55
Binary files /dev/null and b/EarlyBlue/mozapps/plugins/pluginHelp-16.png differ

diff --git a/EarlyBlue/mozapps/plugins/pluginProblem.css b/EarlyBlue/mozapps/plugins/pluginProblem.css
new file mode 100644 (file)
index 0000000..a8ee73c
--- /dev/null
+++ b/EarlyBlue/mozapps/plugins/pluginProblem.css
@@ -0,0 +1,68 @@
+@namespace html url(http://www.w3.org/1999/xhtml);
+
+/* These styles affect only the bound element, not other page content. */
+
+.mainBox {
+    text-align: center;
+    background-color: #CCD0DD;
+    color: #000000;
+    -moz-border-radius: 12px;
+    /* recessed effect with 'disabled' shadow */
+    -moz-box-shadow: inset 0 1px 5px #808080;
+    padding: 5px;
+    -moz-user-select: none;
+}
+
+html|a {
+  color: #000000;
+}
+
+.icon {
+    min-width: 48px;
+    min-height: 48px;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+:-moz-type-unsupported .icon {
+    background-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+:-moz-handler-disabled .icon {
+    background-image: url("chrome://mozapps/skin/plugins/pluginDisabled.png");
+}
+:-moz-handler-blocked .icon {
+    background-image: url("chrome://mozapps/skin/plugins/pluginBlocked.png");
+}
+:-moz-handler-crashed .icon {
+    background-image: url("chrome://mozapps/skin/plugins/pluginCrashed.png");
+}
+
+.throbber {
+    padding-left: 16px; /* width of the background image */
+    background: url("chrome://global/skin/icons/loading.gif") no-repeat;
+    margin-left: 5px;
+}
+
+.msg {
+    font-size: 12px;
+    cursor: default;
+}
+
+.msgBottomLinks {
+    padding-left: 2px;
+    padding-right: 2px;
+}
+
+.msgBottomLinks div {
+    text-align: right;
+    margin-right: 4px;
+    margin-bottom: -19px;
+    min-height: 19px; /* height of biggest line (with throbber) */
+}
+
+.helpIcon {
+    float: left;
+    display: inline-block;
+    min-width: 16px;
+    min-height: 16px;
+    background: url("chrome://mozapps/skin/plugins/pluginHelp-16.png") no-repeat;
+}

diff --git a/LCARStrek/browser/browser.xml b/LCARStrek/browser/browser.xml
index 111c17f54f22c54c24cf863c31b0e80f4d353ef0..516bfb1e2be7ef69ebe34aff44765aafcac55e4f 100644 (file)
--- a/LCARStrek/browser/browser.xml
+++ b/LCARStrek/browser/browser.xml
@@ -16,7 +16,7 @@
         <xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
              anonid="button" allowevents="true"
              xbl:inherits="disabled,image,label,crop,accesskey,command,
-                           buttonover,buttondown,align,dir,pack,orient"/>
+                           align,dir,pack,orient"/>
         <xul:dropmarker type="menu-button" xbl:inherits="open,disabled"
                         class="toolbarbutton-menubutton-dropmarker"/>
       </xul:stack>

diff --git a/LCARStrek/global/about.css b/LCARStrek/global/about.css
index 18f2a6b618eed7d1c3cc2efd7632e0da86610c4c..f62ad4067b82a0fc45cd442fd5fd84c139e2a388 100644 (file)
--- a/LCARStrek/global/about.css
+++ b/LCARStrek/global/about.css
@@ -54,3 +54,8 @@ ul > li {
 th, td {
   padding: 0 5px;
 }
+
+.columns {
+  -moz-column-width: 20em;
+  -moz-column-gap: 3em;
+}

diff --git a/LCARStrek/global/appPicker.css b/LCARStrek/global/appPicker.css
index 561333ee500a99c1c43a030c3d60077ae66fc9b0..ca8352daea259bdc2ccef5adcfddf8212ecde93d 100644 (file)
--- a/LCARStrek/global/appPicker.css
+++ b/LCARStrek/global/appPicker.css
@@ -9,12 +9,11 @@
 
 #content-icon,
 .listcell-icon {
-  height: 32px;
+  margin: 5px;
   width: 32px;
+  height: 32px;
 }
 
-#content-icon,
-.listcell-icon,
 .listcell-label {
-  margin: 5px;
+  padding: 5px;
 }

diff --git a/LCARStrek/global/button.css b/LCARStrek/global/button.css
index 2d4f1e50c3de5d22cfac8d0d6b717587c3c7d5b8..e3311b8fe01a9779a8063b1ed4491bbc85f22281 100644 (file)
--- a/LCARStrek/global/button.css
+++ b/LCARStrek/global/button.css
@@ -50,6 +50,7 @@ button {
   border: none;
   background-color: #000000;
   color: #FFCF00;
+  text-shadow: none;
 }
 
 .button-box {

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index 0ee50ab3eb3e992da018bbd678a8184d7202374d..f1ecfc073139e9607f84a00bb96d4ed6aa5d2ada 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -182,6 +182,13 @@ statusbarpanel {
   padding: 0px 2px;
 }
 
+statusbarpanel:not(.statusbar-resizerpanel):-moz-lwtheme {
+  -moz-appearance: none;
+  border-top-style: none;
+  border-bottom-style: none;
+  -moz-border-start-style: none;
+}
+
 .statusbar-resizerpanel {
   -moz-box-align: end;
   -moz-box-pack: end;

diff --git a/LCARStrek/global/menulist.css b/LCARStrek/global/menulist.css
index 1ee9b22a910d6aabc8a834228adc67c1c18a2faf..519b2abb5baff8d9f8bd3cf9fbf26c860e58fbdd 100644 (file)
--- a/LCARStrek/global/menulist.css
+++ b/LCARStrek/global/menulist.css
@@ -50,6 +50,7 @@ menulist {
   border: 1px solid #9C9CFF;
   background-color: #000000;
   color: #E7ADE7;
+  text-shadow: none;
 }
 
 menulist[menuactive="true"],

diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css
index 087dcd7066590fb1631293eb8f0fc1669132caa5..188cb26b3bfa839cc35ae4a28360a094132b942a 100644 (file)
--- a/LCARStrek/global/toolbarbutton.css
+++ b/LCARStrek/global/toolbarbutton.css
@@ -79,8 +79,7 @@ toolbarbutton:focus {
   -moz-outline-offset: -1px;
 }
 
-toolbarbutton:hover,
-toolbarbutton[buttonover="true"] {
+toolbarbutton:hover {
   background-color: #FFCF00;
   color: #000000;
 }

diff --git a/LCARStrek/mozapps/plugins/missingPlugin.css b/LCARStrek/mozapps/plugins/missingPlugin.css
deleted file mode 100644 (file)
index 1db7f5f..0000000
--- a/LCARStrek/mozapps/plugins/missingPlugin.css
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * This file's style only applies to broken objects, not the rest
- * of the page.
- */
-
-@namespace html url(http://www.w3.org/1999/xhtml);
-
-html|object:not([width]), html|object[width=""],
-html|embed:not([width]), html|embed[width=""],
-html|applet:not([width]), html|applet[width=""] {
-  width: 240px;
-}
-
-html|object:not([height]), html|object[height=""],
-html|embed:not([height]), html|embed[height=""],
-html|applet:not([height]), html|applet[height=""] {
-  height: 200px;
-}
-
-html|object > *|*,
-html|embed > *|*,
-html|applet > *|* {
-  width: inherit;
-  height: inherit;
-}
-
-html|a, html|div {
-  display: inline-block;
-  /* overflow:hidden makes baseline vertical-alignment act like plugins */
-  overflow: hidden;
-  vertical-align: inherit;
-  border: 1px outset;
-  padding: 5px;
-  font-size: 12px;
-  font-family: sans-serif;
-  background: #000000;
-  -moz-user-select: none;
-  text-decoration: none;
-  color: #FFCF00;
-}
-
-vbox {
-  width: inherit;
-  height: inherit;
-  -moz-box-align: center;
-  -moz-box-pack: center;
-}
-
-#missingPluginPlaceholder {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-#disabledPluginPlaceholder {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginDisabled.png");
-}
-
-#blockedPluginPlaceholder {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked.png");
-}
-
-#missingPluginPlaceholder,
-#disabledPluginPlaceholder,
-#blockedPluginPlaceholder {
-  display: block;
-  border: 0px;
-  width: 32px;
-  height: 32px;
-}

diff --git a/LCARStrek/mozapps/plugins/pluginCrashed.png b/LCARStrek/mozapps/plugins/pluginCrashed.png
new file mode 100644 (file)
index 0000000..e76eeca
Binary files /dev/null and b/LCARStrek/mozapps/plugins/pluginCrashed.png differ

diff --git a/LCARStrek/mozapps/plugins/pluginHelp-16.png b/LCARStrek/mozapps/plugins/pluginHelp-16.png
new file mode 100644 (file)
index 0000000..3df227e
Binary files /dev/null and b/LCARStrek/mozapps/plugins/pluginHelp-16.png differ

diff --git a/LCARStrek/mozapps/plugins/pluginProblem.css b/LCARStrek/mozapps/plugins/pluginProblem.css
new file mode 100644 (file)
index 0000000..a41b664
--- /dev/null
+++ b/LCARStrek/mozapps/plugins/pluginProblem.css
@@ -0,0 +1,68 @@
+@namespace html url(http://www.w3.org/1999/xhtml);
+
+/* These styles affect only the bound element, not other page content. */
+
+.mainBox {
+    text-align: center;
+    background-color: #000000;
+    color: #FFCF00;
+    -moz-border-radius: 12px;
+    /* recessed effect with 'disabled' shadow */
+    -moz-box-shadow: inset 0 1px 5px #8050B0;
+    padding: 5px;
+    -moz-user-select: none;
+}
+
+html|a {
+  color: #FFCF00;
+}
+
+.icon {
+    min-width: 48px;
+    min-height: 48px;
+    background-position: center;
+    background-repeat: no-repeat;
+}
+:-moz-type-unsupported .icon {
+    background-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+:-moz-handler-disabled .icon {
+    background-image: url("chrome://mozapps/skin/plugins/pluginDisabled.png");
+}
+:-moz-handler-blocked .icon {
+    background-image: url("chrome://mozapps/skin/plugins/pluginBlocked.png");
+}
+:-moz-handler-crashed .icon {
+    background-image: url("chrome://mozapps/skin/plugins/pluginCrashed.png");
+}
+
+.throbber {
+    padding-left: 16px; /* width of the background image */
+    background: url("chrome://global/skin/icons/loading.gif") no-repeat;
+    margin-left: 5px;
+}
+
+.msg {
+    font-size: 12px;
+    cursor: default;
+}
+
+.msgBottomLinks {
+    padding-left: 2px;
+    padding-right: 2px;
+}
+
+.msgBottomLinks div {
+    text-align: right;
+    margin-right: 4px;
+    margin-bottom: -19px;
+    min-height: 19px; /* height of biggest line (with throbber) */
+}
+
+.helpIcon {
+    float: left;
+    display: inline-block;
+    min-width: 16px;
+    min-height: 16px;
+    background: url("chrome://mozapps/skin/plugins/pluginHelp-16.png") no-repeat;
+}