summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2022-09-15 00:41:57 -0500
committerMatt A. Tobin <email@mattatobin.com>2022-09-15 00:41:57 -0500
commitc8c08b1f5f704d4184cc4beef8fe97b0854f18c5 (patch)
tree68cc9c83d98a3406154797c0567978b71040caf3
parent6cd4c4341d7dcde844094e1f52cabadb4b1e6d34 (diff)
downloadaura-central-c8c08b1f5f704d4184cc4beef8fe97b0854f18c5.tar.gz
[NULL] Make menubars on Windows 10 better match while toolbox backgrounds remain -moz-Dialog
-rw-r--r--apps/navigator/components/bookmarks/content/bookmarksManager.xul3
-rw-r--r--system/themes/windows/global/toolbar.css24
2 files changed, 26 insertions, 1 deletions
diff --git a/apps/navigator/components/bookmarks/content/bookmarksManager.xul b/apps/navigator/components/bookmarks/content/bookmarksManager.xul
index 8ea5cb0f2..260a2bf46 100644
--- a/apps/navigator/components/bookmarks/content/bookmarksManager.xul
+++ b/apps/navigator/components/bookmarks/content/bookmarksManager.xul
@@ -124,7 +124,8 @@
<toolbox id="placesToolbox">
<toolbar id="placesToolbar"
class="chromeclass-toolbar"
- align="center">
+ align="center"
+ type="menubar">
#ifdef MOZ_WIDGET_GTK
<menubar id="placesMenu"
_moz-menubarkeeplocal="true">
diff --git a/system/themes/windows/global/toolbar.css b/system/themes/windows/global/toolbar.css
index 70459701f..58e9f6d72 100644
--- a/system/themes/windows/global/toolbar.css
+++ b/system/themes/windows/global/toolbar.css
@@ -29,6 +29,10 @@ toolbox {
However, local application styling may also provide it on adjacent
widgets as a border-top. Those will need to omit it on Windows 10. */
border-bottom: 1px solid ThreeDShadow;
+
+
+ /* Make the toolbox border more reasonable */
+ border-top: none;
}
}
@@ -51,6 +55,26 @@ toolbar:first-child, menubar {
border-top: 0px !important;
}
+@media (-moz-os-version: windows-win10) and (-moz-windows-theme: aero) {
+ toolbox > toolbar[type="menubar"], menubar {
+ -moz-appearance: none;
+ background-color: #fff;
+ }
+
+ toolbox > toolbar[type="menubar"],
+ toolbox > menubar,
+ toolbar > menubar,
+ toolbaritem > menubar {
+ border-bottom: none !important;
+ }
+
+ toolbar > menubar,
+ toolbaritem > menubar {
+ -moz-appearance: toolbar !important;
+ background-color: transparent !important;
+ }
+}
+
/* ::::: lightweight theme ::::: */
menubar:-moz-lwtheme,