Backed out changeset d906e4dd1e49, bug 538187 - CSS changes for :-moz-window-inactive pseudoclass because of test_righttoleft.xul test failures.
authorMarkus Stange <mstange@themasta.com>
Wed, 17 Mar 2010 19:58:46 +0100
changeset 39535 55f6e18f71cd0906e457317f45f4bdf14f28ec53
parent 39534 b801e211d25fa1d2ec324ea78a6a11209a80ccf7
child 39536 e667d3d7cfe047adbf1effff6c65cd55c9a0aef8
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
bugs538187
milestone1.9.3a4pre
backs outd906e4dd1e4957d46aaad39dfbd6f64990ca52dd
Backed out changeset d906e4dd1e49, bug 538187 - CSS changes for :-moz-window-inactive pseudoclass because of test_righttoleft.xul test failures.
browser/themes/pinstripe/browser/browser.css
browser/themes/pinstripe/browser/places/organizer.css
toolkit/themes/pinstripe/global/console/console.css
toolkit/themes/pinstripe/global/jar.mn
toolkit/themes/pinstripe/global/preferences.css
toolkit/themes/pinstripe/global/toolbar/toolbar-background-inactive.png
toolkit/themes/pinstripe/global/toolbar/toolbar-background.gif
toolkit/themes/pinstripe/global/viewbuttons.css
toolkit/themes/pinstripe/mozapps/downloads/downloads.css
toolkit/themes/pinstripe/mozapps/update/updates.css
toolkit/themes/winstripe/global/global.css
toolkit/themes/winstripe/global/jar.mn
toolkit/themes/winstripe/global/menu.css
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -116,33 +116,62 @@
   -moz-appearance: none;
   background-color: #eeeeee;
 }
 
 #main-window[chromehidden~="toolbar"][chromehidden~="location"][chromehidden~="directories"] {
   border-top: 1px solid rgba(0,0,0,0.65);
 }
 
+/* ----- INACTIVE WINDOW ----- */
+
+#main-window:not([active="true"]) > #navigator-toolbox > #nav-bar {
+  background-image: url("chrome://global/skin/toolbar/toolbar-background-inactive.png");
+}
+
+#main-window:not([active="true"]) > #navigator-toolbox > #PersonalToolbar {
+  background-color: -moz-mac-chrome-inactive;
+  border-bottom-color: rgba(0, 0, 0, 0.32);
+}
+
+#main-window:not([active="true"]) > #navigator-toolbox > #TabsToolbar:not(:-moz-lwtheme) {
+  background-color: #e2e2e2;
+}
+
+#main-window:not([active="true"]) > #navigator-toolbox > toolbar > toolbaritem,
+#main-window:not([active="true"]) > #navigator-toolbox > toolbar > toolbarbutton,
+#main-window:not([active="true"]) .tabs-newtab-button > .toolbarbutton-icon {
+  opacity: 0.75;
+}
+
+#main-window:not([active="true"]) > #browser > vbox > #sidebar,
+#main-window:not([active="true"]) > #browser > vbox > sidebarheader { 
+  background-color: #e8e8e8;
+}
+
+#main-window:not([active="true"]) .tabbrowser-tab {
+  color: #575757;
+}
+
+#main-window:not([active="true"]) .tabbrowser-tab[selected="true"] {
+  background-color: -moz-mac-chrome-inactive;
+}
+
 /* ----- BOOKMARK TOOLBAR ----- */
 
 #PersonalToolbar {
   -moz-appearance: none;
   margin-top: -1px; /* overlay the bottom border of the toolbar above us */
   background-color: -moz-mac-chrome-active;
   border-bottom: 1px solid rgba(0, 0, 0, 0.57);
   min-height: 22px;
   padding: 0 4px 3px;
   -moz-box-align: center;
 }
 
-#PersonalToolbar:-moz-window-inactive {
-  background-color: -moz-mac-chrome-inactive;
-  border-bottom-color: rgba(0, 0, 0, 0.32);
-}
-
 #personal-bookmarks {
   -moz-box-align: center;
 }
 
 toolbarbutton.chevron {
   list-style-image: url("chrome://global/skin/icons/chevron.png");
   margin: 1px 0 0;
   padding: 0;
@@ -305,21 +334,16 @@ toolbar[mode="text"] .toolbarbutton-1 > 
 }
 
 #nav-bar .toolbarbutton-1,
 #restore-button {
   padding-top: 0;
   padding-bottom: 0;
 }
 
-#navigator-toolbox > toolbar > toolbaritem:-moz-window-inactive,
-#navigator-toolbox > toolbar > toolbarbutton:-moz-window-inactive {
-  opacity: 0.75;
-}
-
 #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
 #back-forward-dropmarker:-moz-locale-dir(rtl) > .toolbarbutton-icon {
   -moz-transform: scaleX(-1);
 }
 
 /* ----- DEFAULT BACK BUTTON, STAND-ALONE ----- */	
 
@@ -1335,27 +1359,22 @@ richlistitem[selected="true"][current="t
 }
 
 .editBMPanel_rowLabel {
   text-align: end;
 }
 
 /* ----- SIDEBAR ELEMENTS ----- */
 
-#sidebar,
-sidebarheader {
+#sidebar { 
   background-color: #d4dde5;
 }
 
-#sidebar:-moz-window-inactive,
-sidebarheader:-moz-window-inactive {
-  background-color: #e8e8e8;
-}
-
-sidebarheader {
+sidebarheader { 
+  background-color: #d4dde5;
   padding: 2px;
   text-shadow: none;
 }
 
 #sidebar-box {
   -moz-appearance: dialog;
   -moz-appearance: none;
 }
@@ -1435,16 +1454,20 @@ sidebarheader > .tabs-closebutton > .too
 }
 
 
 toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
 #nav-bar {
+  background-color: #9e9e9e;
+  background-image: url("chrome://global/skin/toolbar/toolbar-background.gif");
+  background-repeat: repeat-x;
+  background-position: top right;
   padding: 0 4px;
 }
 
 #nav-bar[collapsed="true"] + toolbar[customindex] {
  border-top: 2px solid;
  -moz-border-top-colors: rgba(0,0,0,0.35) rgba(255,255,255,0.45);
 } 
 
@@ -1532,66 +1555,51 @@ toolbarbutton.chevron > .toolbarbutton-m
   background-image: url(chrome://browser/skin/tabbrowser/tab-bkgnd.png);
 }
 
 .tabbrowser-arrowscrollbox > .tabs-newtab-button {
   width: 34px;
   padding-top: 1px;
 }
 
-.tabs-newtab-button > .toolbarbutton-icon:-moz-window-inactive {
-  opacity: 0.75;
-}
-
 .tabbrowser-tab[selected="true"] {
   padding: 0 6px 1px;
   border-width: 2px;
   -moz-border-left-colors: rgba(0, 0, 0, .1) rgba(0, 0, 0, .2);
   -moz-border-bottom-colors: rgba(0, 0, 0, .1) rgba(0, 0, 0, .2);
   -moz-border-right-colors: rgba(0, 0, 0, .1) rgba(0, 0, 0, .2);
   background-image: none;
   background-color: -moz-mac-chrome-active;
 }
 
-.tabbrowser-tab[selected="true"]:-moz-window-inactive {
-  background-color: -moz-mac-chrome-inactive;
-}
-
 .tabbrowser-tab:focus > .tab-text {
   -moz-box-shadow: @focusRingShadow@;
 }
 
 .tabbrowser-tab[selected="true"],
 .tabbrowser-tab:hover {
   color: #000000;
 }
 
-.tabbrowser-tab:-moz-window-inactive {
-  color: #575757;
-}
-
-.tabbrowser-tab:-moz-lwtheme {
+.tabbrowser-tab:-moz-lwtheme,
+#main-window:not([active="true"]) .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
   text-shadow: inherit;
 }
 
 #TabsToolbar {
   -moz-appearance: none;
   margin-top: -1px;
   border-bottom: 1px solid #404040;
 }
 
 #TabsToolbar:not(:-moz-lwtheme) {
   background: #9B9B9B url("chrome://browser/skin/tabbrowser/tabbrowser-tabs-bkgnd.png") repeat-x;
 }
 
-#TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive {
-  background-color: #e2e2e2;
-}
-
 .tabbrowser-tabs {
   -moz-box-align: stretch;
   height: 25px;
 }
 
 .tabbrowser-tabs:not([overflow="true"]) {
   -moz-padding-start: 3px;
 }
--- a/browser/themes/pinstripe/browser/places/organizer.css
+++ b/browser/themes/pinstripe/browser/places/organizer.css
@@ -28,17 +28,17 @@
   border-top: @sidebarItemGraphiteBorderTop@;
 }
 
 #placesList:-moz-system-metric(mac-graphite-theme) > treechildren::-moz-tree-row(selected,focus) {
   background: @sidebarItemGraphiteFocusedBackground@;
   border-top: @sidebarItemGraphiteFocusedBorderTop@;
 }
 
-#placesList > treechildren:-moz-window-inactive::-moz-tree-row(selected) {
+window:not([active="true"]) #placesList > treechildren::-moz-tree-row(selected) {
   background: @sidebarItemInactiveBackground@;
   border-top: @sidebarItemInactiveBorderTop@;
 }
 
 #placesList > treechildren::-moz-tree-row(History),
 #placesList > treechildren::-moz-tree-row(history)  {
   background-color: blue;
 }
@@ -98,24 +98,24 @@
 #placesToolbar > toolbarbutton[open="true"] {
   background: rgba(0, 0, 0, 0.6);
   border-color: transparent;
   -moz-box-shadow: @toolbarbuttonPressedInnerShadow@,
                    @loweredShadow@,
                    inset 0 0 0 20px @toolbarbuttonPressedBackgroundColor@;
 }
 
-#placesToolbar > toolbarbutton:-moz-window-inactive {
+:root:not([active]) #placesToolbar > toolbarbutton {
   border-color: @toolbarbuttonInactiveBorderColor@;
   background-image: @toolbarbuttonInactiveBackgroundImage@;
 }
 
 #placesToolbar > toolbarbutton[disabled="true"] > .toolbarbutton-icon,
-#placesToolbar > toolbarbutton > .toolbarbutton-icon:-moz-window-inactive,
-#placesToolbar > toolbarbutton > .toolbarbutton-menu-dropmarker:-moz-window-inactive {
+:root:not([active]) #placesToolbar > toolbarbutton > .toolbarbutton-icon,
+:root:not([active]) #placesToolbar > toolbarbutton > .toolbarbutton-menu-dropmarker {
   opacity: 0.5; /* remove the second and third selector when we support click-through (bug 392188) */
 }
 
 #placesToolbar > toolbarbutton > .toolbarbutton-icon {
   margin: 0 4px;
 }
 
 #placesToolbar > toolbarbutton > .toolbarbutton-text {
@@ -172,17 +172,17 @@
 
 /* maintenance button */
 #maintenanceButton {
   -moz-image-region: rect(0px, 80px, 16px, 64px);
 }
 
 /* Search field */
 
-#searchFilter:-moz-window-inactive {
+:root:not([active="true"]) #searchFilter {
   opacity: 0.7; /* remove this when we support click-through (bug 392188) */
 }
 
 /* Root View */
 #placesView {
   border-top: 1px solid ThreeDDarkShadow;
   -moz-user-focus: ignore;
 }
@@ -195,17 +195,17 @@
 #placesList {
   -moz-appearance: none;
   background-color: #d2d8e2;
   width: 160px;
   margin: 0px;
   border: 0px;
 }
 
-#placesList:-moz-window-inactive {
+#places:not([active="true"]) > #placesView > #placesList {
   background-color: #e8e8e8;
 }
 
 #infoPaneBox {
   border-top: 1px solid #919191;
   background-color: #f0f0f0;
   padding: 10px;
 }
--- a/toolkit/themes/pinstripe/global/console/console.css
+++ b/toolkit/themes/pinstripe/global/console/console.css
@@ -215,13 +215,13 @@ toolbarseparator {
 }
 
 #Console\:clear:active:hover {
   background: @toolbarbuttonPressedBackgroundColor@;
   text-shadow: @loweredShadow@;
   -moz-box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
 }
 
-#Console\:clear:-moz-window-inactive {
+:root:not([active]) #Console\:clear {
   color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through */
   border-color: @toolbarbuttonInactiveBorderColor@;
   background-image: @toolbarbuttonInactiveBackgroundImage@;
 }
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -136,14 +136,16 @@ toolkit.jar:
   skin/classic/global/scale/scale-tray-horiz.gif                     (scale/scale-tray-horiz.gif)
   skin/classic/global/scale/scale-tray-vert.gif                      (scale/scale-tray-vert.gif)
   skin/classic/global/splitter/dimple.png                            (splitter/dimple.png)
   skin/classic/global/splitter/grip-hrz-after.gif                    (splitter/grip-hrz-after.gif)
   skin/classic/global/splitter/grip-hrz-before.gif                   (splitter/grip-hrz-before.gif)
   skin/classic/global/splitter/grip-vrt-after.gif                    (splitter/grip-vrt-after.gif)
   skin/classic/global/splitter/grip-vrt-before.gif                   (splitter/grip-vrt-before.gif)
   skin/classic/global/toolbar/spring.png                             (toolbar/spring.png)
+  skin/classic/global/toolbar/toolbar-background.gif                 (toolbar/toolbar-background.gif)
+  skin/classic/global/toolbar/toolbar-background-inactive.png        (toolbar/toolbar-background-inactive.png)
   skin/classic/global/toolbar/toolbar-separator.png                  (toolbar/toolbar-separator.png)
   skin/classic/global/tree/columnpicker.gif                          (tree/columnpicker.gif)
   skin/classic/global/tree/folder.png                                (tree/folder.png)
   skin/classic/global/tree/item.png                                  (tree/item.png)
   skin/classic/global/tree/sort-asc.gif                              (tree/sort-asc.gif)
   skin/classic/global/tree/sort-dsc.gif                              (tree/sort-dsc.gif)
--- a/toolkit/themes/pinstripe/global/preferences.css
+++ b/toolkit/themes/pinstripe/global/preferences.css
@@ -74,15 +74,15 @@ radio[pane] {
 radio[pane]:active:hover {
   text-shadow: none;
 }
 
 radio[pane][selected="true"] {
   -moz-border-image: url("chrome://global/skin/icons/panebutton-active.png") 0 2 repeat stretch;
 }
 
-radio[pane][selected="true"]:-moz-window-inactive {
+prefwindow:not([active]) radio[pane][selected="true"] {
   -moz-border-image: url("chrome://global/skin/icons/panebutton-inactive.png") 0 2 repeat stretch;
 }
 
 .paneButtonLabel {
   margin: 0 !important;
 }
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a4751e7a673abf4945d4b8de6aa14251db38d11b
GIT binary patch
literal 126
zc%17D@N?(olHy`uVBq!ia0vp^j6kf$!2~3`?xh6)DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MGBrSjv*Ddk}5tu;S^?OW|sN?|Nnf2-g9bG{ab7q7}*#u
X>NxI@Yq`+@RLkJ$>gTe~DWM4f@1i9f
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cd3fecb63e9d191723bd3ef2300f23b3f5357e2c
GIT binary patch
literal 156
zc${<hbhEHbWMq(MIKsfNapT65Cr>U|u;A#?qwCkNKX&ZczJ2>vuU@@)@!}IFPHfq-
z<<Ox++qP|6x^(HTUAvASKR$o{{1q!!ELyZ^)v8qo4jfp!cI}ZPN0u#HwqwVR&6_vx
z*|TT={{0L{K=CIFnAQOiAUhdYB@+Zx{0$?xw@S`xHuPd+a4Ge<cvWGNf`cN1H2}k}
BM{fWC
--- a/toolkit/themes/pinstripe/global/viewbuttons.css
+++ b/toolkit/themes/pinstripe/global/viewbuttons.css
@@ -83,29 +83,29 @@
 }
 
 #viewGroup > radio[selected=true]:active:hover,
 #viewGroup > toolbarbutton[checked=true]:active:hover {
   background-color: #4E4E4E;
   -moz-box-shadow: inset #1c1c1c 0 3px 5px;
 }
 
-#viewGroup:-moz-window-inactive {
+:root:not([active]) #viewGroup {
   background-color: rgba(0, 0, 0, 0.25);
 }
 
-#viewGroup > radio:-moz-window-inactive,
-#viewGroup > toolbarbutton:-moz-window-inactive {
+:root:not([active]) #viewGroup > radio,
+:root:not([active]) #viewGroup > toolbarbutton {
   color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through */
   border-color: rgba(0, 0, 0, 0.4);
   background-image: @toolbarbuttonInactiveBackgroundImage@;
 }
 
-#viewGroup > radio[selected=true]:-moz-window-inactive,
-#viewGroup > toolbarbutton[checked=true]:-moz-window-inactive {
+:root:not([active]) #viewGroup > radio[selected=true],
+:root:not([active]) #viewGroup > toolbarbutton[checked=true] {
   color: #E6E6E6 !important; /* remove this when we support click-through */
   background: #8E8E8E;
   -moz-box-shadow: inset rgba(0, 0, 0, 0.5) 0 3px 5px;
 }
 
 #viewGroup > radio:-moz-locale-dir(ltr):first-child,
 #viewGroup > radio:-moz-locale-dir(ltr)[first-visible],
 #viewGroup > radio:-moz-locale-dir(rtl):last-child,
--- a/toolkit/themes/pinstripe/mozapps/downloads/downloads.css
+++ b/toolkit/themes/pinstripe/mozapps/downloads/downloads.css
@@ -105,17 +105,17 @@ richlistitem[type="download"] button {
 }
 
 #search {
   -moz-box-pack: end;
   -moz-padding-end: 4px;
   -moz-appearance: statusbar;
 }
 
-#searchbox:-moz-window-inactive {
+:root:not([active]) #searchbox {
   opacity: 0.7;
 }
 
 #clearListButton {
   -moz-appearance: none;
   min-height: 18px;
   min-width: 0;
   margin: 0 6px;
@@ -129,13 +129,13 @@ richlistitem[type="download"] button {
 }
 
 #clearListButton:hover:active:not([disabled="true"]) {
   background: @toolbarbuttonPressedBackgroundColor@;
   text-shadow: @loweredShadow@;
   -moz-box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
 }
 
-#clearListButton:-moz-window-inactive {
+:root:not([active]) #clearListButton {
   color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through, bug 392188 */
   border-color: @toolbarbuttonInactiveBorderColor@;
   background-image: @toolbarbuttonInactiveBackgroundImage@;
 }
--- a/toolkit/themes/pinstripe/mozapps/update/updates.css
+++ b/toolkit/themes/pinstripe/mozapps/update/updates.css
@@ -52,17 +52,17 @@ wizardpage {
 }
 
 .wizard-buttons button:hover:active:not([disabled="true"]) {
   background: @toolbarbuttonPressedBackgroundColor@;
   text-shadow: @loweredShadow@;
   -moz-box-shadow: @toolbarbuttonPressedInnerShadow@, @loweredShadow@;
 }
 
-.wizard-buttons button:-moz-window-inactive {
+:root:not([active]) .wizard-buttons button {
   color: @toolbarbuttonInactiveFontColor@ !important; /* remove this when we support click-through, bug 392188 */
   border-color: @toolbarbuttonInactiveBorderColor@;
   background-image: @toolbarbuttonInactiveBackgroundImage@;
 }
 
 .loadingBox {
   padding: 3px 5px 3px 5px;
 }
--- a/toolkit/themes/winstripe/global/global.css
+++ b/toolkit/themes/winstripe/global/global.css
@@ -159,16 +159,22 @@ statusbarpanel:not(.statusbar-resizerpan
 }
 
 .statusbarpanel-iconic,
 .statusbarpanel-iconic-text,
 .statusbarpanel-menu-iconic {
   padding: 0 1px;
 }
 
+%ifdef XP_WIN
+window:not([active="true"]) menubar > menu {
+  color: ThreeDShadow;
+}
+%endif
+
 /* XXXBlake yeah, shoot me -- these don't belong here.  I'll move them later. */
 
 sidebarheader {
   height: 25px;
   background-color: -moz-Dialog;
   -moz-appearance: toolbox;
   border-bottom: 1px solid ThreeDShadow;
   border-top: 1px solid ThreeDHighlight;
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -21,17 +21,17 @@ toolkit.jar:
         skin/classic/global/filefield.css
         skin/classic/global/filepicker.css
         skin/classic/global/findBar.css
 *       skin/classic/global/global.css
         skin/classic/global/globalBindings.xml
         skin/classic/global/groupbox.css
         skin/classic/global/linkTree.css
         skin/classic/global/listbox.css
-*       skin/classic/global/menu.css
+        skin/classic/global/menu.css
         skin/classic/global/menulist.css
         skin/classic/global/netError.css
         skin/classic/global/numberbox.css
         skin/classic/global/notification.css
         skin/classic/global/passwordmgr.css
         skin/classic/global/popup.css
         skin/classic/global/preferences.css
         skin/classic/global/printPageSetup.css
--- a/toolkit/themes/winstripe/global/menu.css
+++ b/toolkit/themes/winstripe/global/menu.css
@@ -164,22 +164,16 @@ menubar > menu:-moz-lwtheme:not([disable
 }
 
 menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
   background-color: Highlight;
   color: HighlightText !important;
   text-shadow: none;
 }
 
-%ifdef XP_WIN
-menubar > menu:-moz-window-inactive {
-  color: ThreeDShadow;
-}
-%endif
-
 /* ..... internal content .... */
 
 .menubar-left {
   color: inherit;
 }
 
 .menubar-text {
   margin: 1px 6px 2px 6px !important;