From b2fbdb393935ea6170120f5e8b93402b1b6b80d4 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sun, 14 Nov 2021 17:22:23 -0800
Subject: [PATCH] Update macOS titlebar to better match original

---
 src/components/layout/styled.tsx  |   9 +++++++--
 src/img/icons/close-mac-hover.png | Bin 312 -> 507 bytes
 src/img/icons/close-mac.png       | Bin 289 -> 553 bytes
 src/img/icons/max-mac-hover.png   | Bin 329 -> 566 bytes
 src/img/icons/max-mac.png         | Bin 290 -> 557 bytes
 src/img/icons/min-mac-hover.png   | Bin 318 -> 532 bytes
 src/img/icons/min-mac.png         | Bin 290 -> 556 bytes
 7 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/layout/styled.tsx b/src/components/layout/styled.tsx
index 8802d10..c344aab 100644
--- a/src/components/layout/styled.tsx
+++ b/src/components/layout/styled.tsx
@@ -73,10 +73,10 @@ export const WindowControl = styled.div`
 
 export const MacControl = styled.div`
   display: grid;
-  grid-template-columns: repeat(3, 30px);
+  grid-template-columns: repeat(3, 20px);
   position: absolute;
   top: 0;
-  left: 0;
+  left: 4px;
   height: 100%;
 
   -webkit-app-region: no-drag;
@@ -94,6 +94,11 @@ export const MacControlButton = styled.div<{
   width: 100%;
   height: 100%;
   grid-column: ${(props) => (props.minButton ? 2 : props.maxButton || props.restoreButton ? 3 : 1)};
+
+  img {
+    width: 18px;
+    height: 18px;
+  }
 `;
 
 export const WindowControlButton = styled.div<{
diff --git a/src/img/icons/close-mac-hover.png b/src/img/icons/close-mac-hover.png
index 7f371fdad6a87eff3ac79b0b8341aa56071d7df8..7630acaf17c28bec00529e1851569623f0855d57 100644
GIT binary patch
delta 479
zcmV<50U-Xk0{a6YiBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJtof5HF&
z4#EKyC`y0;00EFmL_t(IPvw)lN<%>qhX2`(X!HanidV2PXsNLg-@rlyAvQLOFX2nr
z`2-3Q3n8tooi+wL!6b!vLqyQ1x$cg8b~oTj;tS~4?C!ra{|+<f;O|0yji6UndNG<@
zLQKw^W6FuT1i^U>yk3a?)0)+Of6!s1GnpiY`qmL2*aY(&NjVkjtkeUDu2HET(`P+L
z+3br=@I;LC&RPN(+(6L3OF?4R7y&}~OKqYFTrL+-t?l9KDJzan-`%AN^Q(n;a31mA
zEee8JE3`~P{GJj)3OzmBkjVurcp^qjI&EH^fhi<>y@Qq}#WW->x`QKPe*_XUBx6&N
zO4=a-)3-?z<A&ggW^nf@c84ReZAM&Vt?q4Oe}i>6!AEEmykcoL%0sD=tt*^ZJ1tGC
zTR>g9gClCxz!hqZLoR=~*M3&!_x$l$L|q-AF7j6Jbo7K*S4Vh!ID>ef`5=*^n4GYB
zv-t!;H>lK(@$z;ea=B-lHQ?#m-0&BnvEgMFlr}ZH=_oFe#3h<{=X7vZwc39G_y*m(
VhdEmT_3!`y002ovPDHLkV1g?z)42cu

delta 282
zcmV+#0p<St1GoYqiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyyf5QL(
z4#NS*Z>VGd007NNL_t(IPpy*44TC@oML&^PBub(P3gDDe%0QICDJKe`2uea?ks$tK
zGJ**?usq2y_>ccA#+&CES9mP%(_A+AJ;Lkh$upBkB@(8DMxvIeP`)<>TLUf55k)zI
z0Puayk0US)K-U%WRjf_iBV?vHaE^g66jfvf$IMaF-C10N)U3=R7v`wx(Jb!F#BO^J
z)xP&)*jefru0dli>>sMJBNo@7Hn%-Z%jXK_sA)Sbu0ds5)wV$2YY~HE=CqBKPE~IH
gkxp=X7Y+h^06$|&4f$RW;{X5v07*qoM6N<$f^U3rvH$=8

diff --git a/src/img/icons/close-mac.png b/src/img/icons/close-mac.png
index 9c6ca5c017db35fbe6e01494b6352af380df39f3..cc3d6f9f22958622c50fece1f3460417843a9f11 100644
GIT binary patch
literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0lrB@K~y+T<&)1&
z8!-^Z$M&wb3FJW3OaG{stda@|g>Y$m>?0u23zzmS`VxH!xWJ(jH=d!rB&vi&1e-`f
zv}q$0piR4*-5r~;aU`}0FVOxZYrWstpFA@*{JSvsEpP~7P+Rj~_#SI&fY4}Kvp%Bg
zusHi%kD{qvc!xQoqt&O?<x+KXIgr~5py3Pg#OPU$-vop1uWY)XTwfeKKN()w4UU4*
zaidXLsswMAq<mj3m+OjiU_#iKMg*=DjN?DiBuPFDuamu(QS{RW3GTiY8HlFz{I|vg
zJr96PC^b9G+-TKOIrRPD-Ac({H}Z^v5go6^Ijh-|u=(;CO;bz?{!DPb;bcp}NDHWW
zRFhdc3!#`0{4r;@O_)(IA{KUWA=E}UvlLT9-OCZbn!?@-#V}Vxs$1j~OEEPK9aOq+
zx})jmZ;Zw$mMT0$rrJ)n6pS#=zGP{-JC5T>U`{7Qo2wl(H`-+!_p)@l1CzXCH#z2N
z(yiAY29*a}6)Cr=O`+%UM@FX$`JHPx{Y@7#9gjYS{U0N{!LhKoC-g+H8N8AlTTJoW
rC&Hnp6l<SfO+LLI3=+HWe*oYHO|h#k?uIuh00000NkvXXu0mjf%>wSf

literal 289
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X4tu&dhE&{2`t$$4J+o><XQPwDMn;_%O#MDzB^yIb1b#Db
zG!6NoA&}4VXlc=M{Y5`!3R?0knDu(6g~cn&n>QqGL_{8Zw7>3u+K+#)#Sd?nx0h<X
z<CfxlAy$C*lFos%XAc}{`5>!qZOv?bWJA>g#qx$PLNSRC_%}&L8pkLG@TjnVl{)9J
zrOi@Wy5UshWfQ6XCMF*7hEuXf(+{`>Wc>gAo!{Bm1E{RmZ_djEO@k?+4hwtLrKUgf
kVHZ(fvT){11|}YcK#AbGL$1H;f!<;8boFyt=akR{074;di2wiq

diff --git a/src/img/icons/max-mac-hover.png b/src/img/icons/max-mac-hover.png
index d890aa296a8a0303a6bcd76d34e4507cb9a551d8..ca55908d2f9875efc41ade7b92236e2e6eb9fc98 100644
GIT binary patch
delta 538
zcmV+#0_FY50=5JpiBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJtof5HF&
z4#EKyC`y0;00GNML_t(IPvw(MOB_KEhWl$~R%b+Z5kbXV9M;^_c!=@lZ4W^Z^x{ST
zMgBzoL~@CTfENi~b4nEAA_z({EBF;f{6I5V*V*Z=RQI%y&U(l>d7zo$eXDA^t9r=4
z3$;&&_(Lri9;rNMo*Dz7vDO%<e|;%={fJ&|B-QnM6Zjh)g{F4qD?L$ZE{K9fs>mo4
zVo2+<Ex!{1d)bd{<+63X`sL}`g-NhDg{F6Bd!n#+A&5$^!g5q45_dwG@e}|d97yvj
zP43d>>zmWdcbik|x5h+@D2wNZW1cUTy31je<`hk|F<&o+-_%-HC5k;Se^?ItE8|60
zfm29OnBa_!P>D&jvwd2lxJ%FHPdHW2tZZ-!5x^o`3_Tp@F|<b+A0&1N4>%csu6_Lr
z+*qd&ZoL6go+waO=|p=<<)=VdVkLvSBan3^<-VQ{=qdey)_~(x$kZVP*s`+0DU`~a
z?RGnR+q_N_5I_`OBy&M<a4CIo)X-~S%o~xjdXZJo(UZx&mwkO*<#|6WEfP>M7v6x@
zWuBj5r@ys+wpP+Ceg7$5JvRxKN1I#wS_|5;_XY9k1Ww#c2Y;0YHfJk2KKpzy^RZ<D
c{|5;91v2!mPW4iVWB>pF07*qoM6N<$f?yTxzyJUM

delta 300
zcmV+{0n`4r1jzy+iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyyf5QL(
z4#NS*Z>VGd007=eL_t(IPpy*Q4T3Nb#*eCi#Ka9;gav$K01{UrtYX3dytx32xPgg5
zKrP-^3QExjfnRcIdw)LYU9GyVX$nHGqnRu)xWfK?uy_gC0yZB$CSyz4lGE<kE9eR6
z;>hvb$aWoC+AHOMRClV1lFGb@fB6`HikMdjQS5CuWUn0(3!w~q_z*)*liFYk1o*NL
z!`8ru7=x>In3;b2+uzW!wl9jwQ!oWGH0&2ThKY2T0x7yJrPRka@FB)voE@e>f>Gs{
yD^)iZdP-&3!>7lXG^q{qKBO_sK7~IadI6#VUJbz{S#kgX002ovPDHLk0$_rmL3<hi

diff --git a/src/img/icons/max-mac.png b/src/img/icons/max-mac.png
index 3a86691902b1f33f1e89f4bd4f8a3c9c683a3926..78de801a46d5ad9391847b6c3cc2e69b1b00ada5 100644
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0m4Z{K~y+T-I76T
z6fqRXU-D)qGuqj;RS>KQva7{Ytq9^*=s^%Kq6hU;_&GfHq$e*@Pksiybm>iSw_ri*
zLAJZl?aU^5iOEcCjVpNX?~>vFfBDaQN#N|l!W#1m#D&W@?g8iP3|JpHfF-*J)(j>c
z`w2FO^H6!hLQrSx>PmL0e3%yEi3?dn#8qEK%6_*<pVhH^Th9)+kDea<3|ks7tS#@?
z%Cg8GiKXIYe(~I0A@YtWa>#^$q)1CVpIo;Dw}7XUYP0(Vw#O%(xu#E9mUcZA;+a?}
zZl;t1GWQ?bddN6<EnhDB8PA?CrR;X=v_wG`*aqXghlIe`;_-Q{@e;g-oZSg>Lloo+
zdzkQ5<nhFR;yqV$#Rc_))DQ*vmcrNn`KvY_&DxP6^NkDzWfAWY(E%Ad3{pef5jO)O
zvqwliG>E5o&3I3neFkPH$PH1@q_(?SsyFqx8Y<L4?yi3iK-PfQs>9=v*6Q^{!k~3p
z;!}0+f<H+1-L*`OGF@HEOiNuVDPcaF|B&^3AZKc;qUxP`JQ{~x4gWse4<NeJ-hD`L
v!(Dd2dD+B9z}3$5NPmPEU+YkL_5t_>3~{kTwm-|l00000NkvXXu0mjf{Gt6)

literal 290
zcmV+-0p0$IP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy#7RU!RCwBA{Qv(y10{fofkHsB0W9bO
zVjFZAfmAdQ`vb8xRQM<mZv^6{uL7>1_?Zzo44|6p*||9C**Mr4SlC#>;(vbqX885v
zC&SNgKN^ADMr1?KT@Ve@%*D^cz{G^`9UCXmFm|wE^*}@J0O=*T!oVM7GqPs5LZBE(
z4(c_WfoKhLHr4=x$XU}g8jpek3>SdP9mQwBMo?(~`}Yq+Ge`_12aQgg>0l`^lvO~X
ojVBtH;!Fn=C#0d7nE(O|04MZQedt=SxBvhE07*qoM6N<$f&d+JB>(^b

diff --git a/src/img/icons/min-mac-hover.png b/src/img/icons/min-mac-hover.png
index 0790f584239f50f7218f737fc2f248aa1dc823fc..994107aa215d7389376cec24620b855e49e1d310 100644
GIT binary patch
delta 504
zcmV<U0SErR0+a+HiBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJtof5HF&
z4#EKyC`y0;00F5<L_t(IPvw!#P8%^4g^xWMQba=4C@KQfcEN})A*fPmSs)$(2{zfl
zTl6LR678m0AhBbM*zmU?V%3NysamN&LP3E*ewp#@wLMW~n7#o0B<p(4wU5Wgc({nT
zI;fo>jfrQk;iu<72&_tV?vye5fAvVtR{K`_%RM8tznDWdw~EZ8B7eRVo;R&^3ZtL!
zP{DP#Bzm1~@oKN3^&yUt`usKv^<<q*-iiF!EJAJzX`7^g6oDG;DmvZwxN3Zoi^nb7
z1maZ|(I1~f+TSoHx4OlHxagthtciRkKx$+YqmSpcI>a#|i2|gYv44^ff1lPuuD<si
z(p#{i#W8}yj7V`N!|No$J<e^4PmLeJ;_jg2S4@VSwXTt%8b#3$6YRg>9;xUTBvoU@
zaK{K`M5?Y|2V@d<(OQb@Ao>m!o><Z18g-ke81z4yC-(JU@z57Am*6>TbkVM1aQgwB
zR#~e<?qx!|%Xxa5UBlQ&PLX2>IQ&VYN8xWi_6u%$B{Z8`a_QjQY=}t=SDgiE(SGrU
uq+ifxMwF^1BAno|awt~5^^EpE0Q>>UbB_r=wm^^o0000<MNUMnLSTYwYUxJ+

delta 288
zcmV+*0pI?V1ik_xiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyyf5QL(
z4#NS*Z>VGd007fTL_t(IPpy*85rQxfg&#Pg=*2p0ff^hNpcsZ?D1fmBTCff;{^1Dj
z%VGv19zedCg=9DTlI+H7ng;*ixBtofE%1GX)4`K(A{L89bP1(cA(mr*>?QOCG&#j)
zogxf?V5$D<3EV2+de3B*bw%7Ob|fZww*|r#u#hl~WBM4=(^*`B*zD{Nl!iXW^lBD&
zWn_;%gvLH~F$`=q4p*Qw1^b1@*b$2>P?&1hbvx}qA7k21iz|?uR-G@h_yN2miN-N~
m+QwX$Dl<Q%3C!MwkpORsS4s_BMWtW>0000<MNUMnLSTYXSam4?

diff --git a/src/img/icons/min-mac.png b/src/img/icons/min-mac.png
index 54e512c79604c9dcaadfc6340341118c037d2a30..38e477ecdb0f5c1356417714586f7d1d07d82ef1 100644
GIT binary patch
literal 556
zcmV+{0@MA8P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0l`T`K~y+T<&(`y
z96=DrtGj1s)^+^IDu@vzVF%4k%_aC4f?m9+C&7zHU&4z=NiNAH9t3ZB2EDih1VwlE
z5J(JRT^DD^{hIDdb=xY<W?vxwVCd#wRe!pxdf@+s+126O9t4HK@ehGubBHVg4j@xi
zp{4jHsh;p{Xxr2$dW_CKLVh@ySPH}JDk?VX2|lH>x~clbIbI}j=OAgtNAETpRa;_k
zjLtv7&|omJGL*~ijOKGQfC7NihZICf*%Iov%~B(2?KW$juQS`VyN60jv#Y^pujT^Z
zU(+Ut87j0U8ro}ZG(Qmeer7#8!sl(o;21IV7Ca#e`Xr3?w$ErvK*sZ?CBl0v8(bs7
z3qtoqU#A}wqny{kcw`lWV?<}~Jw_iGy8U&G5LH<!^%E2|wjUIur*Mr*m8@cLjaXVt
z)3l<egZS9xXN<-rJ%#iK?M|(1aExSJ|K9F&zSL{Y660N})FZb++G~x*U+&88=hRn4
z8!`0s<YGS@AIOHw!(p(hkVhGhPud6hTY$Q1+_w)}aeNqUC4X#*;h)XDq+f*P#uhy;
u78nOJ9VwyAQJ#W#bNqG#S|;%&0Pq*}ji@ZAf^r!E0000<MNUMnLSTZd#`5|A

literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5Xj(EB_hE&{2`t$$4J+o><XQPwDMn;_%O#ah6jG0zuD12j2
z%3kpyP~jfO5%1Kbd5eC`6tv`7FzfZs9Tu-FEpJNPxDj#i(f+!>X+Qq`6+gT^-(ITm
zj$4ZJg;)XJOF9Y%&K@|@@<CQz-J03j`o@N;1&ZYjUxZ>3AMkIIj5Ll>4B$~=|0;FP
zVN08(v~<I%$jc^D{Y^|f;ti){kES1R3&{BY`#Zn0u?J9Duiu=P37Q5|LLC<Ns!L6O
l<ijqazGUIdnG8%k43lDmn_qN&UIO$FgQu&X%Q~loCIHobZ~p)Q