Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 14 insertions, 49 deletions

diff --git a/toolkit/themes/windows/global/menu.css b/toolkit/themes/windows/global/menu.css
index 4868f41ed1..4889de0003 100644
--- a/toolkit/themes/windows/global/menu.css
+++ b/toolkit/themes/windows/global/menu.css
@@ -51,20 +51,22 @@ menubar > menu[_moz-menuactive="true"]:not([disabled="true"]) {
   color: -moz-menubarhovertext;
 }
 
-menubar > menu:-moz-lwtheme {
-  appearance: none;
-  border-color: transparent;
+*|*:root[lwtheme] {
+  menubar > menu {
+    appearance: none;
+    border-color: transparent;
+
+    &:not([disabled="true"]) {
+      color: inherit;
+    }
+    &[_moz-menuactive="true"]:not([disabled="true"]) {
+      background-color: SelectedItem;
+      color: SelectedItemText;
+      text-shadow: none;
+    }
+  }
 }
 
-menubar > menu:-moz-lwtheme:not([disabled="true"]) {
-  color: inherit;
-}
-
-menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
-  background-color: SelectedItem;
-  color: SelectedItemText;
-  text-shadow: none;
-}
 
 /* ..... internal content .... */
 
diff --git a/toolkit/themes/windows/global/tabprompts.css b/toolkit/themes/windows/global/tabprompts.css
deleted file mode 100644
index 2b5fbdf55f..0000000000
--- a/toolkit/themes/windows/global/tabprompts.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* Tab Modal Prompt boxes */
-.tabModalBackground,
-tabmodalprompt {
-  background-color: hsla(0,0%,10%,.5);
-}
-
-tabmodalprompt {
-  font-family: sans-serif; /* use content font not system UI font */
-}
-
-.tabmodalprompt-mainContainer {
-  color: FieldText;
-  background-color: Field;
-  border-radius: 2px;
-  border: 1px solid threeDDarkShadow;
-}
-
-.tabmodalprompt-buttonContainer {
-  background-color: hsla(0,0%,0%,.05);
-  border-top: 1px solid hsla(0,0%,0%,.05);
-}
diff --git a/toolkit/themes/windows/global/toolbar.css b/toolkit/themes/windows/global/toolbar.css
index 45b79eafdd..ada6f77f9c 100644
--- a/toolkit/themes/windows/global/toolbar.css
+++ b/toolkit/themes/windows/global/toolbar.css
@@ -8,14 +8,7 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-toolbox {
-  appearance: auto;
-  -moz-default-appearance: toolbox;
-}
-
 toolbar {
-  appearance: auto;
-  -moz-default-appearance: toolbar;
   min-width: 1px;
   min-height: 19px;
 }
@@ -24,11 +17,6 @@ toolbar:first-child {
   min-width: 1px;
 }
 
-toolbox:-moz-lwtheme,
-toolbar:-moz-lwtheme {
-  appearance: none;
-}
-
 toolbarseparator {
   appearance: auto;
   -moz-default-appearance: separator;