summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNew Tobin Paradigm <email@mattatobin.com>2020-04-15 17:13:27 -0400
committerGitHub <noreply@github.com>2020-04-15 17:13:27 -0400
commit0553f440b8746c344c4982f2bededa077c52bf2a (patch)
tree8a40b9a4ff08bc2107d91ea888b6f623d4e0cc63
parent427ed7ca38e879ce6b174e7cb7fe280c3b6587a0 (diff)
parent40f64d4822a3a4ab01ba98cba4a2febea36c7fc4 (diff)
downloadpalemoon-0553f440b8746c344c4982f2bededa077c52bf2a.tar.gz
Merge pull request #1778 from Lootyhoof/osx-titlebar
Add MOZ_CAN_DRAW_IN_TITLEBAR to OS X theme
-rw-r--r--palemoon/themes/osx/browser.css15
1 files changed, 13 insertions, 2 deletions
diff --git a/palemoon/themes/osx/browser.css b/palemoon/themes/osx/browser.css
index 983acbd15..2c6d9eddb 100644
--- a/palemoon/themes/osx/browser.css
+++ b/palemoon/themes/osx/browser.css
@@ -93,6 +93,7 @@
}
/* Blend the topmost toolbar with the titlebar */
+%ifdef MOZ_CAN_DRAW_IN_TITLEBAR
#main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #nav-bar:not(:-moz-lwtheme),
#main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #PersonalToolbar[collapsed=true]
~ #TabsToolbar:not(:-moz-lwtheme),
@@ -110,6 +111,14 @@
#main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme) {
border-bottom: 1px solid rgba(26,26,26,0.2);
}
+%else
+#main-window[tabsontop=false] #nav-bar:not(:-moz-lwtheme),
+#main-window[tabsontop=false] #PersonalToolbar[collapsed=true]
+ ~ #TabsToolbar:not(:-moz-lwtheme),
+#main-window[tabsontop=true] #TabsToolbar:not(:-moz-lwtheme) {
+ -moz-appearance: toolbar;
+}
+%endif
#personal-bookmarks {
min-height: 24px;
@@ -124,7 +133,7 @@
}
-
+%ifdef MOZ_CAN_DRAW_IN_TITLEBAR
/* ::::: titlebar ::::: */
#main-window[sizemode="normal"]:not([privatebrowsingmode=temporary]) > #titlebar {
@@ -180,7 +189,7 @@
margin-left: 7px;
margin-top: 3px;
}
-
+%endif
/* ::::: bookmark toolbar ::::: */
#personal-bookmarks {
@@ -2799,6 +2808,7 @@ toolbar[brighttext] #addonbar-closebutton {
right: auto;
}
+%ifdef MOZ_CAN_DRAW_IN_TITLEBAR
#main-window[privatebrowsingmode=temporary] {
background-image: url("chrome://browser/skin/privatebrowsing-mask.png");
background-position: top right;
@@ -2852,3 +2862,4 @@ toolbar[brighttext] #addonbar-closebutton {
padding-inline-end: 50px;
}
}
+%endif \ No newline at end of file