sync both themes with toolkit windows theme changes in Mozilla 36 cycle

diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css
index 6724853ee9c9ce70859a620e04f26b9b684856bf..1aa900ba94deb3c2e28dcea0bbbb3a4b1c5642cb 100644 (file)
--- a/EarlyBlue/global/global.css
+++ b/EarlyBlue/global/global.css
@@ -59,6 +59,7 @@ window.dialog {
   list-style-image: url("chrome://global/skin/icons/alert-message.gif");
 }
 
+.alert-dialog #info\.icon,
 .alert-icon {
   list-style-image: url("chrome://global/skin/icons/alert-exclam.gif");
 }

diff --git a/EarlyBlue/global/in-content/common.css b/EarlyBlue/global/in-content/common.css
index 07afc667a1b822fd63742817f102817b564a88a1..3ba0b39dc78bf9eef66fa298acad747dd59f7353 100644 (file)
--- a/EarlyBlue/global/in-content/common.css
+++ b/EarlyBlue/global/in-content/common.css
@@ -74,6 +74,7 @@ xul|tabpanels {
   border: none;
   padding: 0;
   background-color: transparent;
+  color: inherit;
 }
 
 xul|tabs {
@@ -91,7 +92,7 @@ xul|*.tabs-right {
 xul|tab {
   -moz-appearance: none;
   margin-top: 0;
-  padding: 0 20px;
+  padding: 4px 20px;
   min-height: 44px;
   color: #424f5a;
   background-color: #fbfbfb;
@@ -105,7 +106,8 @@ xul|tab:hover {
 
 xul|tab[selected] {
   background-color: #ebebeb;
-  box-shadow: inset 0 -4px 0 0 #ff9500;
+  padding-bottom: 0; / compensate the 4px border /
+  border-bottom: 4px solid #ff9500;
 }
 
 xul|*.tab-text {
@@ -133,7 +135,6 @@ xul|menulist {
   height: 30px;
   color: #333;
   line-height: 20px;
-  text-shadow: 0 1px 1px #fefffe;
   border: 1px solid #c1c1c1;
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
@@ -189,7 +190,7 @@ xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
   height: 16px;
   border: none;
   background-color: transparent;
-  list-style-image: url("chrome://global/skin/in-content/dropdown.png");
+  list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown");
 }
 
 xul|*.help-button {
@@ -199,6 +200,7 @@ xul|*.help-button {
   background-color: #ffcb00;
   background-image: none;
   box-shadow: none;
+  list-style-image: url("chrome://global/skin/in-content/help-glyph.svg");
 }
 
 xul|*.help-button:not([disabled="true"]):hover {
@@ -220,17 +222,8 @@ xul|*.help-button > xul|*.button-box {
 }
 
 xul|*.help-button > xul|*.button-box > xul|*.button-icon {
-  width: 26px;
-  height: 26px;
-  background-image: url("chrome://global/skin/in-content/help-glyph.png");
-  background-position: center;
-}
-
-@media (min-resolution: 2dppx) {
-  xul|*.help-button > xul|*.button-box > xul|*.button-icon {
-    background-size: 26px 26px;
-    background-image: url("chrome://global/skin/in-content/help-glyph@2x.png");
-  }
+  width: 18px;
+  height: 18px;
 }
 
 xul|*.help-button > xul|*.button-box > xul|*.button-text {
@@ -274,32 +267,20 @@ xul|*.spinbuttons-down[disabled="true"] > xul|*.button-box > xul|*.button-icon {
 
 xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker {
   -moz-appearance: none;
-  -moz-margin-end: 10px;
+  -moz-margin-end: 4px;
   padding: 0;
   border: none;
   background-color: transparent;
-  list-style-image: url("chrome://global/skin/in-content/dropdown.png");
+  list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown");
 }
 
-xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
-  list-style-image: url("chrome://global/skin/in-content/dropdown-disabled.png")
+xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker > xul|*.dropmarker-icon {
+  width: 18px;
+  height: 18px;
 }
 
-@media (min-resolution: 2dppx) {
-  xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker,
-  xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
-    list-style-image: url("chrome://global/skin/in-content/dropdown@2x.png");
-  }
-
-  xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
-    list-style-image: url("chrome://global/skin/in-content/dropdown-disabled@2x.png")
-  }
-
-  xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker > xul|*.dropmarker-icon,
-  xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker > xul|*.dropmarker-icon {
-    width: 10px;
-    height: 16px;
-  }
+xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
+  list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown-disabled")
 }
 
 xul|menulist > xul|menupopup,
@@ -315,10 +296,10 @@ xul|menulist > xul|menupopup xul|menuitem,
 xul|button[type="menu"] > xul|menupopup xul|menu,
 xul|button[type="menu"] > xul|menupopup xul|menuitem {
   -moz-appearance: none;
-  font-size: 1.25rem;
-  line-height: 22px;
-  height: 40px;
+  font-size: 1rem;
   color: #333;
+  padding-top: 0.2em;
+  padding-bottom: 0.2em;
   -moz-padding-start: 10px;
   -moz-padding-end: 30px;
 }
@@ -328,8 +309,7 @@ xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] {
   color: #333;
-  background-color: transparent;
-  background-image: linear-gradient(rgba(76,177,255,0.25), rgba(23,146,229,0.25));
+  background-color: rgba(0,149,221,0.25);
 }
 
 xul|menulist > xul|menupopup > xul|menu[selected="true"],
@@ -337,7 +317,7 @@ xul|menulist > xul|menupopup > xul|menuitem[selected="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] {
   color: #fff;
-  background-image: linear-gradient(#4cb1ff, #1792e5);
+  background-color: #0095DD;
 }
 
 xul|menulist > xul|menupopup xul|menuseparator,
@@ -514,7 +494,8 @@ xul|*.category:hover {
 xul|*.category[selected] {
   background-color: #343f48;
   color: #f2f2f2;
-  box-shadow: inset 4px 0 0 0 #ff9500;
+  -moz-padding-start: 11px; / compensate the 4px border /
+  -moz-border-start: solid 4px #ff9500;
 }
 
 xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] {

diff --git a/EarlyBlue/global/in-content/help-glyph.svg b/EarlyBlue/global/in-content/help-glyph.svg
new file mode 100644 (file)
index 0000000..738f1d7
--- /dev/null
+++ b/EarlyBlue/global/in-content/help-glyph.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">\r
+       <path d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89\r
+               c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182\r
+               C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457\r
+               c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z" fill="#000000"/>\r
+</svg>\r

diff --git a/EarlyBlue/global/inContentUI.css b/EarlyBlue/global/inContentUI.css
index 587dcb6fc725d294a94f20bbbdfb1f0edcdb2964..fa29ca25c043f2a04b5cf0fe7df97d0bbca94ece 100644 (file)
--- a/EarlyBlue/global/inContentUI.css
+++ b/EarlyBlue/global/inContentUI.css
@@ -20,6 +20,13 @@ html|html {
   font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
 }
 
+/* Use the new in-content colors for #contentAreaDownloadsView. After landing
+   of bug 989469 the colors can be moved to *|*:root */
+*|*#contentAreaDownloadsView {
+  background: #CCD0DD;
+  color: #000000;
+}
+
 /* Content */
 *|*.main-content {
   /* Needed to allow the radius to clip the inner content, see bug 595656 */

diff --git a/EarlyBlue/global/media/TopLevelImageDocument.css b/EarlyBlue/global/media/TopLevelImageDocument.css
index aef3a455a20322d331671fec2307f34edbf588f1..89202e872cdcd5ff1331fa9308b0b73fee407729 100644 (file)
--- a/EarlyBlue/global/media/TopLevelImageDocument.css
+++ b/EarlyBlue/global/media/TopLevelImageDocument.css
@@ -8,7 +8,7 @@
     background-color: #222;
   }
 
-  img.decoded {
+  img.transparent {
     background-color: #fff;
     color: #222;
   }

diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css
index 3a700c2c999352bdffb27b42f94e61bcaa63a9d9..9d0334fda3fcdd5f30b36854adb1b012fd500f81 100644 (file)
--- a/EarlyBlue/global/media/videocontrols.css
+++ b/EarlyBlue/global/media/videocontrols.css
@@ -75,6 +75,16 @@
   background-clip: content-box;
 }
 
+.controlBar[fullscreen-unavailable] > .volumeStack {
+  /* This value is duplicated in the videocontrols.xml adjustControlSize function. */
+  -moz-margin-end: 8px;
+}
+
+.volumeControl .scale-thumb {
+  min-width: 0;
+  opacity: 0;
+}
+
 .durationBox {
   -moz-box-pack: center;
 }

diff --git a/EarlyBlue/global/toolbar.css b/EarlyBlue/global/toolbar.css
index e0d603caab97653187650ba82ce19df5649a7318..ef5f1ce8407c564bd4055c92091b92f173e65e48 100644 (file)
--- a/EarlyBlue/global/toolbar.css
+++ b/EarlyBlue/global/toolbar.css
@@ -34,9 +34,8 @@ toolbaritem > menubar {
 menubar:-moz-lwtheme,
 toolbox:-moz-lwtheme,
 toolbar:-moz-lwtheme {
-  -moz-appearance: none;
   background: none;
-  border-style: none;
+  border-color: transparent;
 }
 
 /* ::::: toolbar decorations ::::: */

diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css
index 1d9b7109731610f07519b20ee6de0c87d33022e7..59a635a1f6177a446beaa75a8d27daa283e5a430 100644 (file)
--- a/EarlyBlue/mozapps/extensions/extensions.css
+++ b/EarlyBlue/mozapps/extensions/extensions.css
@@ -426,7 +426,7 @@
 }
 
 .addon[active="false"] .icon {
-  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+  filter: grayscale(1);
 }
 
 .addon-view[type="theme"] .icon {

diff --git a/EarlyBlue/mozapps/extensions/extensions.svg b/EarlyBlue/mozapps/extensions/extensions.svg
deleted file mode 100644 (file)
index 04f18d3..0000000
--- a/EarlyBlue/mozapps/extensions/extensions.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg">
-  <filter id="greyscale">
-    <feColorMatrix type="saturate" values="0"/>
-  </filter>
-</svg>

diff --git a/EarlyBlue/mozapps/extensions/selectAddons.css b/EarlyBlue/mozapps/extensions/selectAddons.css
index 17dd92430548541a6997fe50bccdbc8fdee37029..cabd79766376421d0e59aee114a9ad92004d56e1 100644 (file)
--- a/EarlyBlue/mozapps/extensions/selectAddons.css
+++ b/EarlyBlue/mozapps/extensions/selectAddons.css
@@ -155,7 +155,7 @@
 .addon:not([active]) .addon-icon,
 #disable-list .addon-icon,
 #incompatible-list .addon-icon {
-/*  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale"); */
+/*  filter: grayscale(1); */
 }
 
 #footer {

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index 071d561c453d9d7f6a1595adeec323efffb01b3a..9172104f397283f12823df4f4f361a9999a3c83c 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -89,6 +89,7 @@ window.dialog {
   list-style-image: url("chrome://global/skin/icons/alert-message.gif");
 }
 
+.alert-dialog #info\.icon,
 .alert-icon {
   list-style-image: url("chrome://global/skin/icons/alert-exclam.gif");
 }

diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css
index 3476dc3c69fd40c68b1ca8ac0610a5424b8bf3a1..8931e9c82be37a30e96db3399de4b6270cf8652e 100644 (file)
--- a/LCARStrek/global/in-content/common.css
+++ b/LCARStrek/global/in-content/common.css
@@ -74,6 +74,7 @@ xul|tabpanels {
   border: none;
   padding: 0;
   background-color: transparent;
+  color: inherit;
 }
 
 xul|tabs {
@@ -91,7 +92,7 @@ xul|*.tabs-right {
 xul|tab {
   -moz-appearance: none;
   margin-top: 0;
-  padding: 0 20px;
+  padding: 4px 20px;
   min-height: 44px;
   color: #424f5a;
   background-color: #fbfbfb;
@@ -105,7 +106,8 @@ xul|tab:hover {
 
 xul|tab[selected] {
   background-color: #ebebeb;
-  box-shadow: inset 0 -4px 0 0 #ff9500;
+  padding-bottom: 0; / compensate the 4px border /
+  border-bottom: 4px solid #ff9500;
 }
 
 xul|*.tab-text {
@@ -133,7 +135,6 @@ xul|menulist {
   height: 30px;
   color: #333;
   line-height: 20px;
-  text-shadow: 0 1px 1px #fefffe;
   border: 1px solid #c1c1c1;
   -moz-border-top-colors: none !important;
   -moz-border-right-colors: none !important;
@@ -192,18 +193,22 @@ xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
   height: 16px;
   border: none;
   background-color: transparent;
-  list-style-image: url("chrome://global/skin/in-content/dropdown.png");
+  list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown");
 }
 
+*/
 xul|*.help-button {
+/*
   min-width: 30px;
   border-radius: 2px;
   border: 1px solid #c1c1c1;
   background-color: #ffcb00;
   background-image: none;
   box-shadow: none;
+*/
+  list-style-image: url("chrome://global/skin/in-content/help-glyph.svg");
 }
-
+/*
 xul|*.help-button:not([disabled="true"]):hover {
   background-color: #f4c200;
   background-image: none;
@@ -223,17 +228,8 @@ xul|*.help-button > xul|*.button-box {
 }
 */
 xul|*.help-button > xul|*.button-box > xul|*.button-icon {
-  width: 26px;
-  height: 26px;
-  background-image: url("chrome://global/skin/in-content/help-glyph.png");
-  background-position: center;
-}
-
-@media (min-resolution: 2dppx) {
-  xul|*.help-button > xul|*.button-box > xul|*.button-icon {
-    background-size: 26px 26px;
-    background-image: url("chrome://global/skin/in-content/help-glyph@2x.png");
-  }
+  width: 18px;
+  height: 18px;
 }
 
 xul|*.help-button > xul|*.button-box > xul|*.button-text {
@@ -277,32 +273,20 @@ xul|*.spinbuttons-down[disabled="true"] > xul|*.button-box > xul|*.button-icon {
 
 xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker {
   -moz-appearance: none;
-  -moz-margin-end: 10px;
+  -moz-margin-end: 4px;
   padding: 0;
   border: none;
   background-color: transparent;
-  list-style-image: url("chrome://global/skin/in-content/dropdown.png");
+  list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown");
 }
 
-xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
-  list-style-image: url("chrome://global/skin/in-content/dropdown-disabled.png")
+xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker > xul|*.dropmarker-icon {
+  width: 18px;
+  height: 18px;
 }
 
-@media (min-resolution: 2dppx) {
-  xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker,
-  xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
-    list-style-image: url("chrome://global/skin/in-content/dropdown@2x.png");
-  }
-
-  xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
-    list-style-image: url("chrome://global/skin/in-content/dropdown-disabled@2x.png")
-  }
-
-  xul|menulist:not([editable="true"]) > xul|*.menulist-dropmarker > xul|*.dropmarker-icon,
-  xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker > xul|*.dropmarker-icon {
-    width: 10px;
-    height: 16px;
-  }
+xul|menulist[disabled="true"]:not([editable="true"]) > xul|*.menulist-dropmarker {
+  list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown-disabled")
 }
 
 xul|menulist > xul|menupopup,
@@ -318,10 +302,10 @@ xul|menulist > xul|menupopup xul|menuitem,
 xul|button[type="menu"] > xul|menupopup xul|menu,
 xul|button[type="menu"] > xul|menupopup xul|menuitem {
   -moz-appearance: none;
-  font-size: 1.25rem;
-  line-height: 22px;
-  height: 40px;
+  font-size: 1rem;
   color: #333;
+  padding-top: 0.2em;
+  padding-bottom: 0.2em;
   -moz-padding-start: 10px;
   -moz-padding-end: 30px;
 }
@@ -331,8 +315,7 @@ xul|menulist > xul|menupopup > xul|menuitem[_moz-menuactive="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menu[_moz-menuactive="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menuitem[_moz-menuactive="true"] {
   color: #333;
-  background-color: transparent;
-  background-image: linear-gradient(rgba(76,177,255,0.25), rgba(23,146,229,0.25));
+  background-color: rgba(0,149,221,0.25);
 }
 
 xul|menulist > xul|menupopup > xul|menu[selected="true"],
@@ -340,7 +323,7 @@ xul|menulist > xul|menupopup > xul|menuitem[selected="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menu[selected="true"],
 xul|button[type="menu"] > xul|menupopup > xul|menuitem[selected="true"] {
   color: #fff;
-  background-image: linear-gradient(#4cb1ff, #1792e5);
+  background-color: #0095DD;
 }
 
 xul|menulist > xul|menupopup xul|menuseparator,
@@ -517,7 +500,8 @@ xul|*.category:hover {
 xul|*.category[selected] {
   background-color: #343f48;
   color: #f2f2f2;
-  box-shadow: inset 4px 0 0 0 #ff9500;
+  -moz-padding-start: 11px; / compensate the 4px border /
+  -moz-border-start: solid 4px #ff9500;
 }
 
 xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[current] {

diff --git a/LCARStrek/global/in-content/help-glyph.png b/LCARStrek/global/in-content/help-glyph.png
deleted file mode 100644 (file)
index 30d71da..0000000
Binary files a/LCARStrek/global/in-content/help-glyph.png and /dev/null differ

diff --git a/LCARStrek/global/in-content/help-glyph.svg b/LCARStrek/global/in-content/help-glyph.svg
new file mode 100644 (file)
index 0000000..738f1d7
--- /dev/null
+++ b/LCARStrek/global/in-content/help-glyph.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">\r
+       <path d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89\r
+               c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182\r
+               C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457\r
+               c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z" fill="#000000"/>\r
+</svg>\r

diff --git a/LCARStrek/global/in-content/help-glyph@2x.png b/LCARStrek/global/in-content/help-glyph@2x.png
deleted file mode 100644 (file)
index c60c4b5..0000000
Binary files a/LCARStrek/global/in-content/help-glyph@2x.png and /dev/null differ

diff --git a/LCARStrek/global/inContentUI.css b/LCARStrek/global/inContentUI.css
index f1200713784bd30c1894746980416ee74982d01c..78940c0bbe4cd28552ffb48a6729a73ad5b96c57 100644 (file)
--- a/LCARStrek/global/inContentUI.css
+++ b/LCARStrek/global/inContentUI.css
@@ -20,6 +20,13 @@ html|html {
   font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
 }
 
+/* Use the new in-content colors for #contentAreaDownloadsView. After landing
+   of bug 989469 the colors can be moved to *|*:root */
+*|*#contentAreaDownloadsView {
+  background: #000000;
+  color: #FF9F00;
+}
+
 /* Content */
 *|*.main-content {
   /* Needed to allow the radius to clip the inner content, see bug 595656 */

diff --git a/LCARStrek/global/media/TopLevelImageDocument.css b/LCARStrek/global/media/TopLevelImageDocument.css
index 1fff0b1c607ad0ca87fa1363ccad80cbe5725b31..d5fac6a735255c0e5e88c936914aa9cf7b8f65a6 100644 (file)
--- a/LCARStrek/global/media/TopLevelImageDocument.css
+++ b/LCARStrek/global/media/TopLevelImageDocument.css
@@ -8,7 +8,7 @@
     background-color: #221500;
   }
 
-  img.decoded {
+  img.transparent {
     background-color: #FFFFFF;
     color: #221500;
   }

diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css
index 76a34ef37f8faf60beb11ba658089e3f79c92450..f8d4cfd8481297e554b1f6c3f133658d62e356e6 100644 (file)
--- a/LCARStrek/global/media/videocontrols.css
+++ b/LCARStrek/global/media/videocontrols.css
@@ -117,6 +117,16 @@
   background-clip: content-box;
 }
 
+.controlBar[fullscreen-unavailable] > .volumeStack {
+  /* This value is duplicated in the videocontrols.xml adjustControlSize function. */
+  -moz-margin-end: 8px;
+}
+
+.volumeControl .scale-thumb {
+  min-width: 0;
+  opacity: 0;
+}
+
 .durationBox {
   -moz-box-pack: center;
 }

diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css
index 2cae9c96e86a39f5d4d31c3042cb44e61918c14a..b9b82072fdebb6d6e917e25d97380bb14310efde 100644 (file)
--- a/LCARStrek/global/toolbar.css
+++ b/LCARStrek/global/toolbar.css
@@ -98,7 +98,6 @@ toolbar > menubar {
 menubar:-moz-lwtheme,
 toolbox:-moz-lwtheme,
 toolbar:-moz-lwtheme {
-  -moz-appearance: none;
   background: none;
   border-color: transparent;
 }

diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css
index 20797a38191adacc45293b96ebd80bc6422f164d..85b5523f5fe68859e1fa00d7a92113d0426f0a6c 100644 (file)
--- a/LCARStrek/mozapps/extensions/extensions.css
+++ b/LCARStrek/mozapps/extensions/extensions.css
@@ -468,7 +468,7 @@
 }
 
 .addon[active="false"] .icon {
-  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+  filter: grayscale(1);
 }
 
 .addon-view[type="theme"] .icon {

diff --git a/LCARStrek/mozapps/extensions/extensions.svg b/LCARStrek/mozapps/extensions/extensions.svg
deleted file mode 100644 (file)
index 04f18d3..0000000
--- a/LCARStrek/mozapps/extensions/extensions.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg">
-  <filter id="greyscale">
-    <feColorMatrix type="saturate" values="0"/>
-  </filter>
-</svg>

diff --git a/LCARStrek/mozapps/extensions/selectAddons.css b/LCARStrek/mozapps/extensions/selectAddons.css
index 9a06c62e3addef3b57a9d7b0cfaadf7d7efdfcfd..7784688e8d702b5f443630aa264bdae1df2c5b2b 100644 (file)
--- a/LCARStrek/mozapps/extensions/selectAddons.css
+++ b/LCARStrek/mozapps/extensions/selectAddons.css
@@ -156,7 +156,7 @@
 .addon:not([active]) .addon-icon,
 #disable-list .addon-icon,
 #incompatible-list .addon-icon {
-/*  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale"); */
+/*  filter: grayscale(1); */
 }
 
 #footer {