From 86d78f68c961cfecdeecc9d950079e3dc4ca4581 Mon Sep 17 00:00:00 2001 From: SpockMan02 Date: Sun, 8 Jul 2018 18:15:30 -0700 Subject: Pale Moon: Restore osx private browsing indicator --- application/palemoon/themes/osx/browser.css | 64 +++++++++++++++++---- application/palemoon/themes/osx/jar.mn | 2 + .../palemoon/themes/osx/privatebrowsing-mask.png | Bin 0 -> 1074 bytes .../themes/osx/privatebrowsing-mask@2x.png | Bin 0 -> 2639 bytes 4 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 application/palemoon/themes/osx/privatebrowsing-mask.png create mode 100644 application/palemoon/themes/osx/privatebrowsing-mask@2x.png diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css index 8d3784afd..bf26be077 100644 --- a/application/palemoon/themes/osx/browser.css +++ b/application/palemoon/themes/osx/browser.css @@ -27,6 +27,11 @@ border-top: none; } +#main-window { + -moz-appearance: none; + background-color: #eeeeee; +} + #navigator-toolbox::after { content: ""; display: -moz-box; @@ -79,7 +84,7 @@ /* ::::: titlebar ::::: */ -#main-window[sizemode="normal"] > #titlebar { +#main-window[sizemode="normal"]:not([privatebrowsingmode=temporary]) > #titlebar { -moz-appearance: -moz-window-titlebar; } @@ -2405,19 +2410,56 @@ toolbar[brighttext] #addonbar-closebutton { right: auto; } -#main-window[privatebrowsingmode=temporary] #toolbar-menubar { - background-image: url("chrome://browser/skin/privatebrowsing-dark.png"); - background-position: top right; - background-repeat: no-repeat; +#main-window[privatebrowsingmode=temporary] { + background-image: url("chrome://browser/skin/privatebrowsing-mask.png"); + background-position: top right; + background-repeat: no-repeat; + background-color: moz-mac-chrome-active; } -#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) { - background-position: top left; +@media (min-resolution: 2dppx) { + #main-window[privatebrowsingmode=temporary] { + background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png"); + background-size: 38px; + } } -#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon { - list-style-image: url("chrome://browser/skin/privatebrowsing-light.png"); - width: 20px; - height: 16px; +#main-window[privatebrowsingmode=temporary] { + background-position: top right 40px; +} + +#main-window[privatebrowsingmode=temporary][inFullscreen] { + background-position: top right 10px; +} + +#main-window[privatebrowsingmode=temporary]:-moz-locale-dir(rtl) { + background-position: top left 70px; +} + +#main-window[privatebrowsingmode=temporary][inFullscreen]:-moz-locale-dir(rtl) { + background-position: top left 10px; } +#main-window[privatebrowsingmode=temporary]:-moz-window-inactive { + background-color: -moz-mac-chrome-inactive; +} + +#main-window[privatebrowsingmode=temporary][inFullscreen] #nav-bar[tabsontop=false] { + -moz-padding-end: 50px !important; +} + +@media (-moz-mac-lion-theme) { + #main-window[privatebrowsingmode=temporary][inFullscreen] #TabsToolbar[tabsontop=true] { + -moz-padding-end: 50px; + } +} + +@media not all and (-moz-mac-lion-theme) { + #main-window[privatebrowsingmode=temporary] { + background-position: top right 10px; + } + + #main-window[privatebrowsingmode=temporary][inFullscreen][tabsontop=true] #window-controls { + -moz-padding-end: 50px; + } +} diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn index e0c1ccbba..8f1ed0341 100644 --- a/application/palemoon/themes/osx/jar.mn +++ b/application/palemoon/themes/osx/jar.mn @@ -50,6 +50,8 @@ browser.jar: skin/classic/browser/Privacy-16.png skin/classic/browser/Privacy-32.png skin/classic/browser/Privacy-48.png + skin/classic/browser/privatebrowsing-mask.png + skin/classic/browser/privatebrowsing-mask@2x.png skin/classic/browser/privatebrowsing-light.png skin/classic/browser/privatebrowsing-dark.png skin/classic/browser/reload-stop-go.png diff --git a/application/palemoon/themes/osx/privatebrowsing-mask.png b/application/palemoon/themes/osx/privatebrowsing-mask.png new file mode 100644 index 000000000..92f60e29f Binary files /dev/null and b/application/palemoon/themes/osx/privatebrowsing-mask.png differ diff --git a/application/palemoon/themes/osx/privatebrowsing-mask@2x.png b/application/palemoon/themes/osx/privatebrowsing-mask@2x.png new file mode 100644 index 000000000..ec1cf7452 Binary files /dev/null and b/application/palemoon/themes/osx/privatebrowsing-mask@2x.png differ -- cgit v1.2.3