summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-08-21 00:03:07 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-08-21 00:03:07 +0200
commite91682563ce7b58a8a59e600a74e3c55fb45eb98 (patch)
tree422d30acd471f9cc916fdfdbf30893a71c5bd0bc /toolkit
parentcb9a69ec2e1bb9378f17c6031fe6be958bddfdb8 (diff)
downloaduxp-e91682563ce7b58a8a59e600a74e3c55fb45eb98.tar.gz
Fix toolbar styling in non-Australis toolkit themes
This resolves #713
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/themes/linux/global/toolbar.css10
-rw-r--r--toolkit/themes/osx/global/toolbar.css9
-rw-r--r--toolkit/themes/windows/global/toolbar.css12
3 files changed, 30 insertions, 1 deletions
diff --git a/toolkit/themes/linux/global/toolbar.css b/toolkit/themes/linux/global/toolbar.css
index f17fea12f1..1d52aeb8f1 100644
--- a/toolkit/themes/linux/global/toolbar.css
+++ b/toolkit/themes/linux/global/toolbar.css
@@ -31,11 +31,21 @@ menubar, toolbar[type="menubar"] {
padding: 1px 0px;
}
+
+%ifdef MOZ_AUSTRALIS
+menubar:-moz-lwtheme,
+toolbar:-moz-lwtheme {
+ -moz-appearance: none;
+ color: inherit;
+}
+%else
menubar:-moz-lwtheme,
toolbar:-moz-lwtheme {
-moz-appearance: none;
color: inherit;
+ border-style: none;
}
+%endif
/* in browser.xul, the menubar is inside a toolbar... */
toolbaritem > menubar {
diff --git a/toolkit/themes/osx/global/toolbar.css b/toolkit/themes/osx/global/toolbar.css
index 820436f142..f07332d2f3 100644
--- a/toolkit/themes/osx/global/toolbar.css
+++ b/toolkit/themes/osx/global/toolbar.css
@@ -16,12 +16,21 @@ toolbar {
-moz-appearance: toolbar;
}
+%ifdef MOZ_AUSTRALIS
menubar:-moz-lwtheme,
toolbar:-moz-lwtheme {
-moz-appearance: none;
background: none;
border-color: transparent;
}
+%else
+menubar:-moz-lwtheme,
+toolbar:-moz-lwtheme {
+ -moz-appearance: none;
+ background: none;
+ border-style: none;
+}
+%endif
menubar {
-moz-appearance: dialog; /* For content menubars, "toolbar" is too dark, so we use "dialog". */
diff --git a/toolkit/themes/windows/global/toolbar.css b/toolkit/themes/windows/global/toolbar.css
index dcd8d361f0..38c8a617a5 100644
--- a/toolkit/themes/windows/global/toolbar.css
+++ b/toolkit/themes/windows/global/toolbar.css
@@ -37,7 +37,8 @@ toolbar:first-child, menubar {
}
/* ::::: lightweight theme ::::: */
-
+
+%ifdef MOZ_AUSTRALIS
menubar:-moz-lwtheme,
toolbox:-moz-lwtheme,
toolbar:-moz-lwtheme {
@@ -45,6 +46,15 @@ toolbar:-moz-lwtheme {
background: none;
border-color: transparent;
}
+%else
+menubar:-moz-lwtheme,
+toolbox:-moz-lwtheme,
+toolbar:-moz-lwtheme {
+ -moz-appearance: none;
+ background: none;
+ border-style: none;
+}
+%endif
/* ::::: toolbar decorations ::::: */