From d829c9d51cce4435b85d473c0efb923f2fa8b4d5 Mon Sep 17 00:00:00 2001 From: Yura Zenevich Date: Tue, 29 Aug 2017 14:26:32 -0400 Subject: [PATCH] Bug 1383051 - updated private browsing indicators. r=jaws MozReview-Commit-ID: JrUlzpCDbw1 --- browser/base/content/browser.xul | 6 +- browser/themes/linux/browser.css | 6 -- browser/themes/linux/jar.mn | 1 - browser/themes/linux/privatebrowsing-mask.png | Bin 1355 -> 0 bytes browser/themes/osx/browser.css | 74 +++---------- browser/themes/osx/jar.mn | 4 - .../themes/osx/privatebrowsing-mask-short.png | Bin 1074 -> 0 bytes .../osx/privatebrowsing-mask-short@2x.png | Bin 2639 -> 0 bytes browser/themes/osx/privatebrowsing-mask.png | Bin 918 -> 0 bytes .../themes/osx/privatebrowsing-mask@2x.png | Bin 2199 -> 0 bytes browser/themes/shared/browser.inc.css | 21 ++++ .../themes/shared/icons/private-browsing.svg | 11 ++ browser/themes/shared/jar.inc.mn | 1 + browser/themes/windows/browser.css | 97 ++++-------------- browser/themes/windows/jar.mn | 7 -- .../privatebrowsing-mask-tabstrip-win7.png | Bin 949 -> 0 bytes .../windows/privatebrowsing-mask-tabstrip.png | Bin 403 -> 0 bytes ...rivatebrowsing-mask-titlebar-win7-tall.png | Bin 940 -> 0 bytes .../privatebrowsing-mask-titlebar-win7.png | Bin 860 -> 0 bytes .../windows/privatebrowsing-mask-titlebar.png | Bin 370 -> 0 bytes 20 files changed, 70 insertions(+), 158 deletions(-) delete mode 100644 browser/themes/linux/privatebrowsing-mask.png delete mode 100644 browser/themes/osx/privatebrowsing-mask-short.png delete mode 100644 browser/themes/osx/privatebrowsing-mask-short@2x.png delete mode 100644 browser/themes/osx/privatebrowsing-mask.png delete mode 100644 browser/themes/osx/privatebrowsing-mask@2x.png create mode 100644 browser/themes/shared/icons/private-browsing.svg delete mode 100644 browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-tabstrip.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar-win7.png delete mode 100644 browser/themes/windows/privatebrowsing-mask-titlebar.png diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index bbe4559dfb9e..893628cb3259 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -587,9 +587,7 @@ #ifdef XP_WIN - - - + #endif @@ -647,7 +645,7 @@ collapsed="true"> #if defined(MOZ_WIDGET_GTK) - #endif diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index bb84763a13f6..04e812cfc6a3 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -722,12 +722,6 @@ html|span.ac-emphasize-text-url { /* End customization mode */ - -#main-window[privatebrowsingmode=temporary] #private-browsing-indicator { - background: url("chrome://browser/skin/privatebrowsing-mask.png") center no-repeat; - width: 40px; -} - %include ../shared/UITour.inc.css #UITourHighlight { diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn index 2adb9e9b52d0..9335a657a8bf 100644 --- a/browser/themes/linux/jar.mn +++ b/browser/themes/linux/jar.mn @@ -22,7 +22,6 @@ browser.jar: * skin/classic/browser/pageInfo.css skin/classic/browser/pageInfo.png skin/classic/browser/page-livemarks.png - skin/classic/browser/privatebrowsing-mask.png skin/classic/browser/searchbar.css skin/classic/browser/setDesktopBackground.css skin/classic/browser/slowStartup-16.png diff --git a/browser/themes/linux/privatebrowsing-mask.png b/browser/themes/linux/privatebrowsing-mask.png deleted file mode 100644 index 9eaf3aec7e71bd4d7f3e3d91b47fa3717a17a947..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1355 zcmV-R1+@B!P)+)Q@0E&lhs&DR^3-7d?ri(lUFd;b6D`R9G}w)q?Y z{3HAagBC9FTtF;jYgu581A}{aCSD`l2_dnBaD2hzO1Lo(=XK`hG2K4fk*(~-WwWeI z&zX6wK`aQDr%Ja~=lfSr6bJ74m3Wrpx2t!VC@z@v#l#|!K;f&G?`SIuc>f90nKxBh zR3+qx$+%D+AtFyc%V0rnh5ql%L!-HdE``8B<4`%qKbSzO=w2qW1K zFq}1mvBEigMLiQ$574z`7)SJjuYfBk=*+@Z5Ts`&Wg*%2e_1V&!%FLj z6$Yv+iBKZaPZ+&bCoTQKq_v=T?KI92>{%}@`^jIZ+D4uz&a3owi_+7KPByD)(-~-e z^3Jdf7PORv<~r?B99Y+dB=79AR10Gw;mYBw5NRsQm9^+uJBgm8Nw8RJpKZ=y!iO4~Kwit$X_5#k=N@)U#z z3HhO6UIJxSrlk0Jr+NZi>Z>pYy$v5hWR8fxJWR}21O~guMYEn1ALEUh#8&j>-#}$d z9bOk}cd`r?D$T?Kn#2L}!jna^*(`&F*mouH;)kb`;pdu!RUU?o3nqE4Z zIwW|c&n9?eJgkha!{Nj)&=@s{gUkDINNKV4e3W2fA2%);2JSxW}UT>^)UuW5&`Vb9iXVA31m%JUQimwCp zK9L9_^T_8(IB~PNAP!Ctx$vaX3SoS6v`Bk1PLwjI5@~PA1S`r&3m}$qf11G|Zn3qo zq78S+^N>7K;led7t~_}RX<}j#H}kJSYH_N4XFS4}2qhxeP_Fr9?wA*FzZ-APqhu@B z!{cT+{B2OYD8&Xh%!wQ9Oe`iAvib`iN6zEItxjCs;YI%cX8899{RvW$k=wCC>_q?o N002ovPDHLkV1hb=mlFU0 diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index 0586ca999901..bf43cbe5fbae 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -54,6 +54,11 @@ /** Begin titlebar **/ +#titlebar-content { + /* Ensure the the content part of the titlebar does not shrink. */ + min-height: inherit; +} + #titlebar-buttonbox > .titlebar-button { display: none; } @@ -65,10 +70,13 @@ margin-left: 7px; } -.titlebar-placeholder[type="fullscreen-button"], +.titlebar-placeholder[type="fullscreen-button"] { + margin-right: 4px; +} + #titlebar-secondary-buttonbox { - margin-right: 7px; - margin-left: 7px; + align-items: center; + display: flex; } #main-window:not(:-moz-lwtheme) > #titlebar { @@ -1225,67 +1233,19 @@ html|*.addon-webext-perm-list { /* End customization mode */ -.private-browsing-indicator { - background-image: url("chrome://browser/skin/privatebrowsing-mask.png"); - background-repeat: no-repeat; - background-size: 100% auto; - width: 38px; - height: 28px; - /** - * The private browsing mask graphic has a 3px flare at the top. The distance - * we want between the mask and items on either side is 7px, so we use 4px, - * since the other 3px is accounted for by the empty space on either side. - */ - margin-left: 4px; - margin-right: 4px; -} +/* Private browsing indicator */ -#titlebar-secondary-buttonbox > .private-browsing-indicator { - position: relative; -} - -#main-window[privatebrowsingmode=temporary]:not([tabsintitlebar]) > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > .private-browsing-indicator { - background-image: url("chrome://browser/skin/privatebrowsing-mask-short.png"); - height: 20px; -} - -#main-window:not([privatebrowsingmode=temporary]) .private-browsing-indicator, -#main-window[privatebrowsingmode=temporary][inFullscreen] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > .private-browsing-indicator, -#main-window[privatebrowsingmode=temporary]:not([inFullscreen]) > #tab-view-deck > #browser-panel > #navigator-toolbox > #TabsToolbar > .private-browsing-indicator { +:root[privatebrowsingmode=temporary][tabsintitlebar]:not([inFullscreen]) > #tab-view-deck > #browser-panel > #navigator-toolbox > #TabsToolbar > .private-browsing-indicator, +:root[privatebrowsingmode=temporary]:not([tabsintitlebar]) > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > .private-browsing-indicator { display: none; } -@media (min-resolution: 2dppx) { - .private-browsing-indicator { - background-image: url("chrome://browser/skin/privatebrowsing-mask@2x.png"); - } - #main-window[privatebrowsingmode=temporary]:not([tabsintitlebar]) > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > .private-browsing-indicator { - background-image: url("chrome://browser/skin/privatebrowsing-mask-short@2x.png"); - } -} - -#TabsToolbar > .private-browsing-indicator { - /* We offset by 38px for mask graphic, plus 4px to account for the - * margin-left, which sums to 42px. - */ - margin-right: -42px; -} - -#main-window[privatebrowsingmode=temporary] .titlebar-placeholder[type="fullscreen-button"], -#main-window[privatebrowsingmode=temporary] > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > #titlebar-fullscreen-button { - margin-left: 0px; -} - -#main-window[privatebrowsingmode=temporary][inFullscreen] .titlebar-placeholder[type="fullscreen-button"] { - /* Override display:none for .titlebar-placeholder in fullscreen so we can have consistent - position and padding for the private browsing indicator. */ - display: -moz-box; -} - -#TabsToolbar > .private-browsing-indicator:-moz-locale-dir(rtl) { +#TabsToolbar > .private-browsing-indicator:-moz-locale-dir(rtl), -moz-box-ordinal-group: 0; } +/* End private browsing indicator */ + %include ../shared/UITour.inc.css #UITourTooltipDescription { diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index a9118ce7c893..d728427e204a 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -27,10 +27,6 @@ browser.jar: skin/classic/browser/page-livemarks.png skin/classic/browser/page-livemarks@2x.png skin/classic/browser/pageInfo.css - skin/classic/browser/privatebrowsing-mask.png - skin/classic/browser/privatebrowsing-mask@2x.png - skin/classic/browser/privatebrowsing-mask-short.png - skin/classic/browser/privatebrowsing-mask-short@2x.png skin/classic/browser/searchbar.css skin/classic/browser/slowStartup-16.png skin/classic/browser/toolbarbutton-dropmarker.png diff --git a/browser/themes/osx/privatebrowsing-mask-short.png b/browser/themes/osx/privatebrowsing-mask-short.png deleted file mode 100644 index 92f60e29f9fd71ed62101b7f7f22ea37423387a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1074 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 diff --git a/browser/themes/osx/privatebrowsing-mask@2x.png b/browser/themes/osx/privatebrowsing-mask@2x.png deleted file mode 100644 index efb6d9b8070f646a39b04a40ee556386fb5291f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2199 zcmV;I2x#|-P)tYBcYY?|kR%j*aNq*qWp5C%;AHxtB zl!rBiLMcf~rWi>L6DJm1|GarSl!-8<$f_*yOpL+QIs3Mst^R#Z*8hMHfv5l^Fa#U|Ucc#{&z+1c3+>4`X{2&c zNXi9;)R`}4zv$rRudh4-yqiwT2_<~3Uua+*)KW(_UD{P za##Qb(xNLjUft38%rPA0Xyd{Vlmk*ZI2> z!3*@fF~sn(OJ9F}ONjGF<1^b~Qc09lC_^HV6w8f|G-+WccYMU?*(8A)FN@bjXxdmu zbwiNJR0d31?pwr?4fEOk`1^U$fryt4TdpB;b%-2zLl!lS6|{WwN=8m6II&}ZGo4W~ zW46BT)psu>+*rY@4<4del+>AZ_8IT6__-v@?pUa+fGJx(SnK7>Pp#n9hYn#U9R2T_ zr4>`YKm3^>H~g?k*JOJ34Wg8q;bTRK2iM_&3oKy)#o`NlXnkTi*>Rijge*nzobSI- zqA-dVMu{CZc0L6PSJYiwjYi>$WHeKfFx<|t$yF?wcy`LfcG_Vqnxrxk!19_DgOhQH z4=1Ut4Pg09E=4+?b#u@8tnO!+9{TP+d^@Sht&P4`&)WmM^^c>R*w=@Xl^DXHzGXf) zf9qOWzOp>kVm55Q!F~Kyi7C9PRq%% z_{)9&Vz@U3fMFO2!$eBSnXW-z`T1^Izq^WCA6m_&X#d+`c0Y3vjRB@%B5gS#u~%2P zKE%V@?nRgafYeClGR-g~x?HsP_)roQc|mtRehb?kYr~WF<1+*Khr=0}X3QRC?{n|4 z>ds}3*x9rEBV$0rUoPs;!@hr%s2T>2F+178Woo z`1h7Je)QtKc!M53O|mJQZNL66K_lcwR$=DLBg|*`89qD8KcCpermY(h!r;?DDfE9# ztT(|tZ{1}QhD51cA#qE!73SC*r`h)8F7El|t)FX8h373D{K&3ua`4jT zo!tJDwXFZnDlWzO4=?ba-?ZtSG3<$8V!7?E(hsgVQH8=>FU@MRmfo&&JiX~+fDp)%*&5wi`Jc=Xggi z$M^N1B!sOR{3769R$*qh=djW{ERPNpvE~!AqZ46!bWKJe2zzSriy#^d!d5M#wxIi9 zzpg?o!$Y-Iqfh?@Axr8oa6RJbvDs2AObDA3HhG(+EXe1TxDaMb8%H>kK3f^gZj{dIC? zHW@oBvzE_rkeKD53#l9?G9yJcg$6YpVG_U}v3gR&$tIuh>l3&@%;GLnNF-Thlafii z5wjl+ayr7YfNWmV(Al-)RFj1XW(cqFYH0?>EE1Dcmx_{fFDj3N-2NfI)SsFr;{*t+ReAOScOU`(-v zdV!TkJ5S#7yZfJgG#zysyuydTL>RiuX3^Y|NF4oq)K_cvJ@)+f{?M|vc^_~X$V^w5 z0R({C6Qjw + + + + diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 808828beaf47..aab0c3288c43 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -152,6 +152,7 @@ skin/classic/browser/open.svg (../shared/icons/open.svg) skin/classic/browser/page-action.svg (../shared/icons/page-action.svg) skin/classic/browser/print.svg (../shared/icons/print.svg) + skin/classic/browser/private-browsing.svg (../shared/icons/private-browsing.svg) skin/classic/browser/privateBrowsing.svg (../shared/icons/privateBrowsing.svg) skin/classic/browser/quit.svg (../shared/icons/quit.svg) skin/classic/browser/reload.svg (../shared/icons/reload.svg) diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 92f39e8d9df8..0d22d3b39517 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -235,6 +235,12 @@ z-index: 1; } +#titlebar-buttonbox, +#titlebar-buttonbox-container { + display: flex; + align-items: center; +} + .titlebar-placeholder[type="caption-buttons"] { margin-left: 22px; /* space needed for Aero Snap */ } @@ -1082,89 +1088,22 @@ notification[value="translation"] { /* End customization mode */ -/* Private browsing indicators */ +/* Private browsing indicator */ -/** - * Currently, we have two places where we put private browsing indicators on - * Windows. When tabsintitlebar is enabled, we draw the indicator in the titlebar. - * When tabsintitlebar is disabled, we draw the indicator at the end of the - * tabstrip. The titlebar indicator is the fiddliest of the bunch, since we - * want the bottom border of the image to line up with the bottom of the window - * caption buttons. That's why there's so much special-casing going on in here. - */ -.private-browsing-indicator { +:root:-moz-any([tabsintitlebar], [inFullscreen]) .private-browsing-indicator { + margin-inline-end: 12px; +} + +.private-browsing-indicator, + margin-inline-start: 12px; +} + +:root[privatebrowsingmode=temporary][tabsintitlebar]:not([inFullscreen]) > #tab-view-deck > #browser-panel > #navigator-toolbox > #TabsToolbar > .private-browsing-indicator, +:root[privatebrowsingmode=temporary]:not([tabsintitlebar]) > #titlebar > #titlebar-content > #titlebar-secondary-buttonbox > .private-browsing-indicator { display: none; - pointer-events: none; } -#private-browsing-indicator-titlebar { - display: block; - position: absolute; -} - -#main-window[privatebrowsingmode=temporary][tabsintitlebar] #private-browsing-indicator-titlebar > .private-browsing-indicator { - display: block; -} - -#main-window[privatebrowsingmode=temporary]:-moz-any([inFullscreen],:not([tabsintitlebar])) #TabsToolbar > .private-browsing-indicator { - display: -moz-box; -} - -#TabsToolbar > .private-browsing-indicator { - background: url("chrome://browser/skin/privatebrowsing-mask-tabstrip.png") no-repeat center -3px; - margin-inline-start: 4px; - width: 48px; -} - -/* Bug 1008183: We're intentionally using the titlebar asset here for fullscreen - * mode, since the tabstrip "mimics" the titlebar in that case with its own - * min/max/close window buttons. - */ -#private-browsing-indicator-titlebar > .private-browsing-indicator, -#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator { - background: url("chrome://browser/skin/privatebrowsing-mask-titlebar.png") no-repeat center 0px; - margin-inline-end: 4px; - width: 40px; - height: 20px; - position: relative; -} - -@media (-moz-windows-classic) { - /** - * We have to use top instead of background-position in this case, otherwise - * the bottom of the indicator would get cut off by the bounds of the - * private-browsing-indicator element. - */ - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - top: 4px; - } -} - -@media (-moz-os-version: windows-win7) { - @media (-moz-windows-glass) { - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - top: 1px; - } - #main-window[sizemode="maximized"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - top: -1px; - } - } - - /** - * This next block targets Aero Basic, which has different positioning for the - * window caption buttons, and therefore needs to be special-cased. - */ - @media (-moz-windows-default-theme) { - @media (-moz-windows-compositor: 0) { - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator { - background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-win7-tall.png"); - height: 28px; - } - } - } -} - -/* End private browsing indicators */ +/* End private browsing indicator */ %include ../shared/UITour.inc.css diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index f380c552b5cf..a4e2e1fe4be9 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -23,11 +23,6 @@ browser.jar: skin/classic/browser/monitor_16-10.png skin/classic/browser/pageInfo.css skin/classic/browser/pageInfo.png - skin/classic/browser/privatebrowsing-mask-tabstrip.png - skin/classic/browser/privatebrowsing-mask-tabstrip-win7.png - skin/classic/browser/privatebrowsing-mask-titlebar.png - skin/classic/browser/privatebrowsing-mask-titlebar-win7.png - skin/classic/browser/privatebrowsing-mask-titlebar-win7-tall.png skin/classic/browser/searchbar.css skin/classic/browser/setDesktopBackground.css skin/classic/browser/slowStartup-16.png @@ -94,8 +89,6 @@ browser.jar: % override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png % override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png -% override chrome://browser/skin/privatebrowsing-mask-tabstrip.png chrome://browser/skin/privatebrowsing-mask-tabstrip-win7.png os=WINNT osversion<=6.1 -% override chrome://browser/skin/privatebrowsing-mask-titlebar.png chrome://browser/skin/privatebrowsing-mask-titlebar-win7.png os=WINNT osversion<=6.1 % override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-win7.png os=WINNT osversion<=6.1 % override chrome://browser/skin/tabbrowser/tab-background-start.png chrome://browser/skin/tabbrowser/tab-background-start-preWin10.png os=WINNT osversion<=6.3 diff --git a/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png b/browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png deleted file mode 100644 index bd5d46a76a8def4a3d8db31aed36126f5b7b062b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 949 zcmV;m14{gfP)Y3J2j!I0A0q2(DfOXi+Q))Z!WdZr}*6-rhD;dNfD+0Ug8{ za0FLy_8yQSCh*0NfF5)RTTTyPqW}?sGvIiJ1ENsC6(K zX^j6m!%X5&dajisS`){n*eR2Ovgj@eH+`N@W*#`67*HC?mh#etguhf!d7>{x)9aN< z-AnIo4lMI)#9P}Ev)!rRbBlOtL;2;7#pf|>`Bbxf$F6g^V2^ks-fFnfzx*nVw=_(j z-FSf_$jk)CfCbPZSTdc^WZSp?+4qLzliDKbTQQ!ruM?SUd0}rA0Slm^O)fg*FC{2I z^=;F#hhzZvuiyLj9rqr5_J%|M@1A@_yZbPtN=0TS&38b%l$*9d_z4PN%H%_7%*%uI0f z5x_zL^Mt=ZzzlQgP)7V&Wv#r%Q9lcBlf(KzzF^}hptoRDpA%fEE(mK{ti9f=lnrXl zus+^AZ+-*;BxWK<9{~|8X?N;8;V-ophi2RF4r@Fg3(K0rX;4}nHl6F}7l6mgtyfx{ zu;+QU?lyOW9>o!pnF)>o3jm74nKH%5ngxW&usEuQbyA}Sa~__lGy>awic-2#@#oOh{43+o-pGkmhMz%k$f zKx5qKR1u|3{y3yYnH|JX!`r1bVQiu^dG_!zdlK59fOP=<0}DyWlMFxuF~)a5G1`PX zhBL)yJAlHHb|lRbI0KG80+=Y^CxJ7_(MLcS3P?l;F$NsZZa`sZv%D>i5a0|rdItOj Xfp>l0?Pb^300000NkvXXu0mjfJ{+=N diff --git a/browser/themes/windows/privatebrowsing-mask-tabstrip.png b/browser/themes/windows/privatebrowsing-mask-tabstrip.png deleted file mode 100644 index e2eba8b89e4fd2b1b9d33a5f93f6c1bbfdaf9889..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmV;E0c`$>P) z==qcrzpYBnoF&BM#P9Im_R5Oi@7wj%q2;`6*P0;1)uQH>7{Hht!M$$S;=t~lB*g93 z^rJM$!+hK0!S30t=+Bkn@!BN29z;xN1Cd8>i%<9nc>e2GLXV#PyztWrJ zz;oHwq~`SI_}8ZAp)kj}WYx%q-k>hVtVzzIGRWx5@#xI)*sAE-uIZg7#O22C)}`m> z$MDOH;Oo@$<;U=`RMG3x^X}R8&644pBEy}2(rf?#00DGTPE!Ct=GbNc004(cL_t(| zUhUE~62kxxz`*Ft5N2j(=Kp^yGp^E|Yme1$r%XbU*d++0U>KC!mR-+fSFTmr7V|17 z5EYJzs;Zy{vj$O3prrzjPFH$;7#O3|gsBP~<_nP}_#$f$M+F<8v~$7UmjFWra^SC{ x=)gP!gcpFT83RagyFZ>H{_FkuCT6}A`~U&>5GQ}a@O}UQ002ovPDHLkV1j|%*ysQN diff --git a/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png b/browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png deleted file mode 100644 index 4a723c54e2316e978062be38a7be8eaa1a0d11f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 940 zcmV;d15^BoP)Ii(vB-)j7kBfGl73bpa3RF5r2rFQfqefaDKBmoBa)&Zo~SuSC}1(ZjOF>UWv*dH4358!7Os>;wJMm`yOsP3@y4daV6ka;9U`7e z_cWX%FAQ#)8>^q&vaH+faEFzPH)^hRDWApi6axj5s~~aW0(t(8Qf}M~hL>Ew2HEPY zZfDo@YwxJYdzTH8PPP8Hdo*i-H;C*4CUOF?Xb>l`Tt28VJAoYAKldzKj@{#ct=fZk z@*#~G-oW2QR=|%fAQN>jZUanr!H6~^qDphmyGT`bgR`nzG}@h@I+e*@ zeUrPIOe<1lUaZn|=Z|QiF6mJj;SD0YfQghqD;mN}4qDD}uPB`2Er!X_$o??k=(dxv04X4dJCC^uuJ`t*&L)pM~+e z)uvl8S#SL{4u@W8w!)ojZ~g7AWq5pvuHY8Uzh4_*$n1VY0%s0(-VlE#E2%} zw^5Q7T&c!b(}o{vvtv!Fv$5{HTTh{tDN|@KlJi_V&ZIwxuZOY^BwKt0K;NCiDrp?%|I-_Q9Q z0jh+&!1)FlCu$O-Qh*6p01h-|(d%Vw#^_i0`l%3L0VZGrMqGi^fO0|2g??cZL&)bu zPGIf~FaQfM5fzB5z1#LE-KSPj8PYq>3LpOVDuOR?M_@NF01Gpbn+|LqL=KoT6I;_$ z{7MC>v1ht_MmIiqM}~z`zy!Ac z16YF|2C`*XD5WM?U|qaG%FA33wWrR^SI2S{XVaQ8E$K`Xee>_T6dkG9e0PReR2$bP z@29NJ1_A8C1=&(8KoG89I$j~!rl<2&%=^RY*=G6v0dBTC4IZ~tpfT3o<|%16yVvH~ zYlrrImkZ9YCfR<=J)!yyMWFgbTikgS*DEKo1tuRb76BP8^4B&qW}o!T(G( z_1y+{5ZMA#P(a!6<`ImI&@e+u3PYbCPS-R%;O&?;EiNy_q_Mgf5BqnXMbI^+WQKmY zX2t+LKB}<<1w=nP&d*xG0;Q7FshDe*nmlN1?W5k(bazk;G zdgw(Zk-SY1E|rs6+FiNPaUQWE+_1<-H?8OUJ>29hPhn~6auLx-6D?EOigC!t4Q2SZGg!i zn6`*rCd{Ns@r#JYjl8frO@0_%^D>IP20brz0V|GdQ9+*<_FD5Cy~9Wxmt69Ge_%y) zr-FydPzsp-0?VS>6ddyWTn{=3g@6T_e89rkMo~-Rgt&_=p6x+@(NzWvU;&dCn8kW3 zD5gfTRLu!v5_a;JuN}8$MOP8n1_M}_xqK?v00_xp=JrtwNcEz^@FrDJIAi@Pg0|Pe m02VNT4RGF2pbU{vyskfVIUEteAA!IC0000Z2Lb2d7CKIMH_R{q3(n!NWDT z7a5(HqjF?#-VLf*{OG{DuP=V0p{t9YU7Gy_Q~dG4cT}_Z=9(7}L%%%x@$tboOv^q# z_zq{^TKke}7GGKT6lmgslACkXjsUqUozA?v@CjngtBar3dYzjhvVX4Hkpsmyfg;zI zJfoV$r@HO~O}xJB`9g!^5RsiJS0NVf$+->@S)g|e;y$2as#(0o^Bg=R-(LIj;`B#g zf`V{?3GKz1k3d1V0$>18GdtZ_1&U^Z=+?TIRL;k9RF6D8_8u)&Ut9VdS>)OA4?tzq zFF=4<`E<{N*H=D2J^o>1$VG@CFpghe{`~Id*Rzuz&Q>}+l8ekyi$^U603#jiY0Ssy Q{Qv*}07*qoM6N<$f_}`eLI3~&