From 33b1931a9596027beab902ecacd0ed9ca990957c Mon Sep 17 00:00:00 2001 From: Lootyhoof Date: Mon, 30 Mar 2020 23:16:34 +0100 Subject: [PATCH] [Pale-Moon] Make OS X default theme integrate better --- .../palemoon/themes/osx/Search-glass.png | Bin 1448 -> 0 bytes application/palemoon/themes/osx/Search.png | Bin 0 -> 437 bytes application/palemoon/themes/osx/browser.css | 19 ++++++++++++++++-- application/palemoon/themes/osx/jar.mn | 2 +- application/palemoon/themes/osx/searchbar.css | 10 ++++----- 5 files changed, 23 insertions(+), 8 deletions(-) delete mode 100644 application/palemoon/themes/osx/Search-glass.png create mode 100644 application/palemoon/themes/osx/Search.png diff --git a/application/palemoon/themes/osx/Search-glass.png b/application/palemoon/themes/osx/Search-glass.png deleted file mode 100644 index 9eb0e259f23befe254f16d25a0c5e357d82b11ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1448 zcmV;Z1y}lsP)pIOAmyL9gfA~WK;_`y zGV_}6^Zs-OmPe!~5~PGYJ5sC9!rbhXnb&-u_opDyoGVVj&b;1?M zuys8I?{l42e~Q_zCrI6cV;J)S?hzk8|B2v+jDnLx;C-&s62D?ix}G3aoa#b%Z!Zpa z^dQOZL{f!xT&LBanpG_n zIQsD;86WsV5iRrq6q}4cKs#Dlt zsR7q%8YtM;A~xI_RVGj3kKF*8e*?}x1lmUxK7QqQaGh5F7E7&ICJrl;C-M6)0@b&v zX9yHUh0EO!!F5^&R=$@drq;A7lPB?8s+`!?=tAyk7xtV}IIW@;T&HPZk8s+ zJxM|=KxK7K!>h%^ewYF8BKF5V8&Y~N8dT@sR6U^4;HgKJ$ zfuizO!S1{(8{o`yY%Z(feJVRH-2>NY^_zAy2!*Gv$_6;|92=J^-lwv?Qv%m%8i?L5 zd{k5?8{o`yYRi+DmO01cFHLsLbo<&wo`s4u|5* zrq_{dFk)$JmOZQBJAoh)JSy}0xi|4s@tqkjVNci#SQZ?DpoJ0kwFx@}f=KYF%xk|l z@qfhMEz+YrGZ{H1i#L$Z1%L5ZO|M`_{5oukH3ro0FTN^b4%RPv8E-6H?49m2W5R%+ zct_@kNKfDC(?uVN_&?(9@hcD$v)QLxY7MC0UwqnY^RZw-sBdmn;nN%?gT+4@A6d;1hGMuO%;jV)9Xy2?2{IBp8x?wJFOd zCLfkRqyELg%Y5cH=RKSJtQVsb0u?VCm}9Jo+-1)8W~A@*>Y{80I(c+65io0INo0~C z(Hj@D*{cgHFwn^}qyE|R6C%Tcmw1C0gnDNO#Tw}3(aprbzp>vT7khj<$^ZZWB6?I< zbW?9;ba!ELWdHzp+H*|FPfAtr%uP&B4N6T+sRRHooCVab45>{300002kl_sPG{l>fd9e4K~gA|FPxK*iCP6a_& z1Arh18n$iMT-SY_)G$d%QIs=H({9olw%hGn%d#E;fSpd{^Z5;3*Q)@iX`1(jVVpaT zQyUJ4t|*F|k|gbTp7%xwablpZ>s5~9luoB}XIa(*r8Jpd?_gMuKe0zkLheM*iwiSazY0st|PVHh?E%u)>WeZK(!vMe7Y3uRe81b{FM4Ipux zD2mKdskARi()MUHiU=V#%d&jATt3n??HT|K!?+-XI59g^RlQVI^=j65({?av&|on5 z@_oOa%jMR8R;Z^wz%&$w;YYLCJSK#E&O6Q`0A#aS836kI{!6RXI-!(?^Ppd4GMS}f fvAFjaJN~V2nuecC=}Ym700000NkvXXu0mjf$)vh` literal 0 HcmV?d00001 diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css index 68365162c4..0f8b83dde6 100644 --- a/application/palemoon/themes/osx/browser.css +++ b/application/palemoon/themes/osx/browser.css @@ -68,6 +68,21 @@ background-image: linear-gradient(rgba(32,32,32,.8), rgba(32,32,32,0)); } +/* Blend the topmost toolbar with the titlebar */ +#main-window[tabsontop=false]:not([privatebrowsingmode=temporary]) #nav-bar:not(:-moz-lwtheme), +#main-window[tabsontop=true]:not([privatebrowsingmode=temporary]) #TabsToolbar:not(:-moz-lwtheme) { + -moz-appearance: toolbar; +} + +#main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme), +#main-window[tabsontop=true][privatebrowsingmode=temporary] #TabsToolbar:not(:-moz-lwtheme) { + background-color: transparent; +} + +#main-window[tabsontop=false][privatebrowsingmode=temporary] #nav-bar:not(:-moz-lwtheme) { + border-bottom: 1px solid rgba(26,26,26,0.2); +} + #personal-bookmarks { min-height: 24px; } @@ -635,8 +650,8 @@ toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { @conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon { /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */ - clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path); - -moz-margin-start: -6px !important; + clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path); + -moz-margin-start: -9px !important; border-left-style: none; border-radius: 0; padding-left: 7px; diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn index 67339c7cc6..9f45210a93 100644 --- a/application/palemoon/themes/osx/jar.mn +++ b/application/palemoon/themes/osx/jar.mn @@ -60,7 +60,7 @@ browser.jar: skin/classic/browser/privatebrowsing-light.png skin/classic/browser/privatebrowsing-dark.png skin/classic/browser/reload-stop-go.png - skin/classic/browser/Search-glass.png + skin/classic/browser/Search.png skin/classic/browser/searchbar.css skin/classic/browser/searchbar-dropdown-arrow.png skin/classic/browser/Secure24.png diff --git a/application/palemoon/themes/osx/searchbar.css b/application/palemoon/themes/osx/searchbar.css index 55fdfc4bd4..e770ab6a9f 100644 --- a/application/palemoon/themes/osx/searchbar.css +++ b/application/palemoon/themes/osx/searchbar.css @@ -57,9 +57,9 @@ } .search-go-button { - padding: 1px; - list-style-image: url("chrome://browser/skin/Search-glass.png"); - -moz-image-region: rect(0px 16px 16px 0px); + padding: 2px 1px; + opacity: .4; + list-style-image: url("chrome://browser/skin/Search.png"); } .search-go-button:-moz-locale-dir(rtl) { @@ -67,11 +67,11 @@ } .search-go-button:hover { - -moz-image-region: rect(0px 32px 16px 16px); + opacity: .6; } .search-go-button:hover:active { - -moz-image-region: rect(0px, 48px, 16px, 32px); + opacity: .8; } .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {