From e43931f075847f75414c17ce13735c76119efafc Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 6 Feb 2015 04:24:25 -0700 Subject: [PATCH 1/2] =?UTF-8?q?=C2=B5Block=20logo=20refinement=20and=20bro?= =?UTF-8?q?wser=20icon=20organization?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This includes a new, refined µBlock logo, rendered more coherently and consistently for different sizes and display pixel densities. The Safari build script has been modified to bundle appropriate resolutions. The Firefox build script was slightly changed to adhere to the naming convention. The Chrome manifest was modified/ammended slightly to take advantage of new renderings. README's beginning has been modified to be nicer and more minimal. Other than the logo's slightly refined look and having better resolution on different browsers and setups, this should have no effect on the user experience or further development. --- README.md | 8 +- platform/chromium/manifest.json | 6 +- platform/safari/Info.plist | 2 +- src/img/browsericons/icon128.png | Bin 0 -> 1346 bytes src/img/browsericons/icon128@2x.png | Bin 0 -> 2587 bytes src/img/browsericons/icon16-off.svg | 32 +++---- src/img/browsericons/icon16.png | Bin 401 -> 1190 bytes src/img/browsericons/icon16.svg | 32 +++---- src/img/browsericons/icon16@2x.png | Bin 661 -> 452 bytes src/img/browsericons/icon16nofill.png | Bin 0 -> 255 bytes src/img/browsericons/icon16nofill@2x.png | Bin 0 -> 416 bytes src/img/browsericons/icon19-off.png | Bin 273 -> 331 bytes src/img/browsericons/icon19-off@2x.png | Bin 0 -> 481 bytes src/img/browsericons/icon19.png | Bin 308 -> 318 bytes src/img/browsericons/icon19@2x.png | Bin 0 -> 496 bytes src/img/browsericons/icon38-off.png | Bin 421 -> 481 bytes src/img/browsericons/icon38-off@2x.png | Bin 0 -> 875 bytes src/img/browsericons/icon38.png | Bin 399 -> 496 bytes src/img/browsericons/icon38@2x.png | Bin 0 -> 880 bytes src/img/browsericons/icon48.png | Bin 0 -> 652 bytes src/img/browsericons/icon48@2x.png | Bin 0 -> 1044 bytes src/img/browsericons/icon64.png | Bin 0 -> 780 bytes src/img/browsericons/ublock.svg | 16 ++++ src/img/icon_128.png | Bin 880 -> 0 bytes src/img/icon_16.png | Bin 275 -> 0 bytes src/img/ublock.svg | 103 ----------------------- tools/make-firefox.sh | 2 +- tools/make-safari.sh | 7 +- 28 files changed, 64 insertions(+), 144 deletions(-) create mode 100644 src/img/browsericons/icon128.png create mode 100644 src/img/browsericons/icon128@2x.png create mode 100644 src/img/browsericons/icon16nofill.png create mode 100644 src/img/browsericons/icon16nofill@2x.png create mode 100644 src/img/browsericons/icon19-off@2x.png create mode 100644 src/img/browsericons/icon19@2x.png create mode 100644 src/img/browsericons/icon38-off@2x.png create mode 100644 src/img/browsericons/icon38@2x.png create mode 100644 src/img/browsericons/icon48.png create mode 100644 src/img/browsericons/icon48@2x.png create mode 100644 src/img/browsericons/icon64.png create mode 100644 src/img/browsericons/ublock.svg delete mode 100644 src/img/icon_128.png delete mode 100644 src/img/icon_16.png delete mode 100644 src/img/ublock.svg diff --git a/README.md b/README.md index 993dfe0de..721c07891 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# ![logo](https://raw.githubusercontent.com/gorhill/uBlock/master/src/img/browsericons/icon38.png) µBlock -pronounce _you-block_ as in "you decide what enters your browser" / see the "µ" as a stylish "u", to emphasize small resource footprint
sorry for the dubious name, we are coders, not marketers +
+
-**An efficient blocker add-on for various browsers. Fast, potent, and lean.** +**µBlock** *(you-block)*: an efficient blocker extension for Chrome, Firefox, and Safari. *Fast, potent, and lean.* * [Purpose & General Info](#philosophy) * [Performance and Efficiency](#performance) @@ -16,7 +16,7 @@ * [Release History](#release-history) * [Wiki](https://github.com/gorhill/uBlock/wiki) -# ![Build](https://travis-ci.org/gorhill/uBlock.svg?branch=master) +![Build](https://travis-ci.org/gorhill/uBlock.svg?branch=master) ## Philosophy diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index ca795f885..cc6f3a78a 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -7,8 +7,10 @@ "default_locale": "en", "description": "__MSG_extShortDesc__", "icons": { - "16": "img/icon_16.png", - "128": "img/icon_128.png" + "16": "img/browsericons/icon16.png", + "48": "img/browsericons/icon48.png", + "64": "img/browsericons/icon64.png", + "128": "img/browsericons/icon128.png" }, "browser_action": { diff --git a/platform/safari/Info.plist b/platform/safari/Info.plist index 8e4cfb130..10c7c839a 100644 --- a/platform/safari/Info.plist +++ b/platform/safari/Info.plist @@ -37,7 +37,7 @@ Identifier toolbarItem Image - img/browsericons/icon16.png + img/browsericons/icon16nofill.png Label {name} Palette Label diff --git a/src/img/browsericons/icon128.png b/src/img/browsericons/icon128.png new file mode 100644 index 0000000000000000000000000000000000000000..9ec94d7016ebf30290996f9bd366b42fe318b31e GIT binary patch literal 1346 zcmbW1YgCd47{_1U-r`~oqNQakAn9Uhn5AdaCNOlNMtI3dN!~B#q=ruNlBkGUcJwIA zY2g%x-4$ep!-1rB2M?EiFM2N1yj)rw`Bn|2)6{IscE(S?@y!%rRCN z007KAm~Or%7k(bpDwB4&hIW~31K*v)_v1zJlS6-w1n3dGut=guTxfKpZ)9jhYC>n^ zegJ^RJ>2MrQ$}Yh{^V`+|K_nY^QpX7w88l>s`G?*O%mx{e-^0_WqthUj~0uB9Tg#T z&+qT|%c(d@0V;ai4s}^>)N#wv^*)1_8H{|lGoEn9WLWuddtrK8ns&)GSUnM8Qpc$83Qd_OEa7t)_B&V@F;^MBVhz3U}dK7RmYjBT<9$eitZqOp28*&L<1QE&sj~e zXh_$*6{k{^(1g4|5YZO*Ul36UOXS#Ku-w|f`a74B1t^;#P@ur0;5aX$yv6Rzz(r^% zeC7JP?h>+XI}_osH)*PRykY!^(#jv|&fQlkDDHdCKg zwY;dl=NStQ<}j#=HFp673dBJ~6b&aN0(3wGK>rKm6nkh0WVG2$crviJ$(H6=i;17C zc7*cw)KYBqJH7v+3+qt0n5eN+{#6Yl64Tl}#*u~+s-|}fDvTG)JG;>(^eU z8M_oq7$NXWt)@=?oPA;Y=!cV57Y4m#8xZ>}Wur3zq6C-RollXi$Sd6>Th0-m>yXxo zn#gW$)jX^YMy_R6e26s8J)9paA8O(jTH%P}=RXRIJk!QlZP~iO=#H+$Vv;;8$nY`| zD~n_Ao8T5OkYGXQy`DhLL<1uU3?B`f1(US-KbzUg#*s(uCw<=J4o>8{fFE`J!A5zW)S@$xHOT938e&Sux07p^FAY9k2=5=51s3<9?OBbO{cQef>7GSrD7Ft9 z)ldWS)yM|*)9GwuN4E1^?j8QGOMN~xiP66FlghqV(mR`PzVP5HLxDcCdqrb|HF!>U zX&HXxiX$p4dk3P=%=z5%X&!MH)(l}P@mDwPVv21I=d1gvz5toI*%-qxJW+yT`6@&B zN*cHkUJfu}f{}v|6XSGi(LzXlU&=9|wZ^j$O*E&9xpL~I{!`UJ>$YSrn!TBjtds?< ziG^PmT~o2`XwUItfl8W!3i+04W;_TI=>|C30zkh$EzJiQ_(m1p((nR$LY~?}=fa8W zh{cuJ(0h5$F@T(BX5^asQ&c@H)3L(HT}czcuRbSbHY1bfG8{r2@_VB|`p)7#J(q>c zg0_p4Hq#xL3KE3AFABa5FmV+vgs)T9`1+SZu}4;`WJ1RVs-!k literal 0 HcmV?d00001 diff --git a/src/img/browsericons/icon128@2x.png b/src/img/browsericons/icon128@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..10eca832e8dfd789502b5af941711e368a27be5f GIT binary patch literal 2587 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 Q_O}Oi?ey`i^q`#n8|R94hyVZp literal 0 HcmV?d00001 diff --git a/src/img/browsericons/icon16-off.svg b/src/img/browsericons/icon16-off.svg index 58ebf4053..863d3183c 100644 --- a/src/img/browsericons/icon16-off.svg +++ b/src/img/browsericons/icon16-off.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - - + + + + + + + + diff --git a/src/img/browsericons/icon16.png b/src/img/browsericons/icon16.png index 292855bf37e085b4f129a3eff0ef913cde26b876..0aab15da360162c6d527e25be9b772299d31a654 100644 GIT binary patch literal 1190 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z8pn}txArU1JzCKpT`MG+DDfvmMdKI|^K-CNkHWgMtW^QUpqC!P(PF}H9 zg{=};g%ywu64qBz04piUwpEJo4N!2-FG^J~)icpEP_pAvP*AWbN=dT{a&d!d2l8x{ zGD=Dctn~HE%ggo3jrH=2()A53EiLs8jP#9+bb%^#i!1X=5-W7`ij^UTz|3(;Elw`V zEGWs$&r<-Io0ybeT4JlD1hNPYpzh2qfLoMT4D}VzfBF@P1^R}12Kv}Em1L$NoQI+d zBm>a~_7%i38(`2_ITxiSmgEEak-As8EM zn=KM3V*CBxw5!L;@9?BqBRqdZ+YzCag>m_HlZY;+gvWU_+cV*&D2<%;dh&dBkakN zmpkW5r*+T#dN^6wqu(#B>1x-fBPMNp{m)ocoM$N%AKM(fYUO>cwkY-Y=PufBGCcM{ z@rR%L-^=ECX?9Nv^YZQQeO6if;gZ~u@Ae+YL;gP~`yV>}8=udySJA#bb7ma=v3IwJ z`tm?2>tlLZ?mJ9wzT=vvwu-;`V4#vA=bibwK6m%D9y=fZ4jx zX(nD^yv}^xlI`m1*EjyWH}G7W)4loj{^)r^LY5JCZ23jpZgv_~w^XuTU$uZYMvA9z z^NC4Ym;SM6pC-rjw>5bB%)N_L^=po~$$u74G?K`QStpzgDm*-0{an^LB{Ts56aUb~ literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfgaDrqS0HUS{0mWNU!|L>4Fv6p4?IPe@28g@J~KhQ`Lm=H}+s*4DPRw)Xb+ z&d$!RuCDIxZXgNd0vWx%y+CFEVc_4te-I{wA=I&=0_Y}#k|4ie23=G4@RIt-O`A@f zICK8|nd{HqzJ2@f;f^h9*Q{8+Z0VB4OO`HMxp4kAK>>bV9xhG}sgJ%TK)nr~E{-7; zw|e_e3N;xBu*&B(>`>*~!OW$%pymI6>&erbL+89X?ejfx72CA(xf7prKPkSIb$(sp zy}2(_?pOUU%qSGKp6szwqws0Rm0p3>s!rQe|F?fl5;%5Hp=a6Tnf&F6H!_s?XE;?{ xslLgqCT`m=y4RrQnbIteytzxgPOjbjiB%zAP|uU|FDTF%JYD@<);T3K0RXo~s1*PJ diff --git a/src/img/browsericons/icon16.svg b/src/img/browsericons/icon16.svg index 4f6ce99ce..5d5b8510c 100644 --- a/src/img/browsericons/icon16.svg +++ b/src/img/browsericons/icon16.svg @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - - + + + + + + + + diff --git a/src/img/browsericons/icon16@2x.png b/src/img/browsericons/icon16@2x.png index 1a920004fa1b4c4f378cb99e3ee958c3ad1440fb..d41a32595503bca9d95ed0d23acccb25ff366162 100644 GIT binary patch delta 437 zcmV;m0ZRUr1;hi88Gi-<0047(dh`GQ02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00Cx6L_t(|+G1oN0QM*|1OTaiAXZ=?4SWFNi7s~;8t^G%Bw%?0kebgx z8CU>xL?X!!ppxYT9l=Nk%kesbkxrK5bOa+EEywBzMmk%L;eQCm0k9m!5sc7$zMf%V zKp_*fkQpdY&q7KGXS8%bn0~%)A;a^v3sB_LYWf*?Gz}QOT))6@tEG@wBL!GUaju}b z1Eh>Sc@RSmWI0Tp6u`tVz+lt?qYfa;0W5s{1M2`$*8mhgFPT}8YzJ^iD=_FyUk|oa zGB^QVK#>)ijJ38Kxkn_av=lK fi_dZp00=Mupw)h)s`hI%00000NkvXXu0mjf!|bfE literal 661 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dye*%0$T!FN)v9X$(nuCKwR8*9o zpI>5PVr*=zkB^VJxj9fuS65e4Q&U4j1E@w-RTW68tE&UKKygb;ODiiYeSLjBJv|*A z9c^uGEiEmGVxY?I?(UwRp1!`m2@@s&$==@H{{DU-d-3AM%a$!$zI^$rRjbynUAqnp z)~{c`VZ(-vV6b`f<}F*cY~8wb+qP{xcI?=5@ zMT-{ApFiKu&JO4RpsW5Nf&VaoB!M*{U1^iGqg8Ui{o~>M+a~86#V?49^_Jf_dbi;Gj&-w5 z)t%o6`X*&EoPM^X)AV2RhA-g;{##~9_^j9WQDM=soH5gjD@}d=+npg=>P^+E&8A$Z z?H}x3=dwZQ=K3m!fZ#`qA6W~8ti9N{>rJA=Y^B#0=T_Z$%~v4j)rk8rJC xrT9bDded}Mr#;5jTf+AVJiKet8a@C1Z?V3#%#@cus(}7y@O1TaS?83{1OOzoPPza9 diff --git a/src/img/browsericons/icon16nofill.png b/src/img/browsericons/icon16nofill.png new file mode 100644 index 0000000000000000000000000000000000000000..cde6a9db5bb26fea7ab7bcbd7c0b4376b54cba84 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5X7J9lkhE&{2N^xK^PCsYD5cIk+qLI=12g8xRmoHz6CouJ7 z%=*r}k%76cA&En|bCw}bqKdO|m!eOA{p3|M8CRv-3->WF|6DK78P6el*r0{8|Fhl# z$sdffoz&R47>}}TcrdY=q4XPb%sKTZOzaANEx+vL!+kb7JC zQ~){U3Kakq0LPpN6|f~ForDgc1O7-O1jI?!-ei2?OCu{d_J4B5V-uMcrD-}tvq$_G zH{B4&BuTbSFAZAEmuODrf64$6*L70Q=By>=IynJ!Xx<7z3g(Rvq-0(TL5k*92vRn$ zKn!G`UrZRSNs3G;Z6e1Cmm#i*F=F!3mm>#B=A6tVS)D0E#Nzq>$3*FB_B5~50fm)# zGq)C^9w92`wUw|32&;KxDee%W*1YvBkb!g0la9yCo6K1c0R{l!#d^XGs6hAt0000< KMNUMnLSTXjxvww) literal 0 HcmV?d00001 diff --git a/src/img/browsericons/icon19-off.png b/src/img/browsericons/icon19-off.png index f978164c2b5db413b2c9633d39bc3578686009ea..b10b06937acccb5b1ead7d457a9abcf3b1cc0c36 100644 GIT binary patch delta 315 zcmV-B0mS~10?PuB8Gi-<0044OHp~D302y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM008YtL_t(|+G1ot105Y520&^*5DPHi1|NX9u%e=30kR+?83rMPL}UXQ zDKH4bKt>7;LNSn$3I@RqWTKKmAkfc*%OEi^F^0&f`C;=e-fy{gM?0Mnh;<6LSi2(TuS;fzv zKN%i9dPIytjx@l$d4bYW18xwdSySuiwwyCM9larI}?d|>j{e69X<>lqy-`~!! z&}{$!01I?dPE!El&B+@WF4rN^&KxkT2><{9ZAnByR2b8($azZ+fFKM-QK0xm1w?fJ zJ5^q(F=6UWnzl!kM$+8WmltH5H1rJ#S|P!PfP`a@JEk-#jlC}3g=NF7|FGxZ8avX_ zSUO|!)hM$CSIeY2!{)_Irx?Q(KLkWV$j&d#wg8YcN1z*8^$eWn71NRc0000n{+ zIF7T$;T7u{y5)%FV%eL`=Ge9|lSJ)tc!U4R7uHJ~j`fU^#<2lVQaCmcsujluL^a~r zz^IEjMgVmd$B3Y6I7SF{f_p#|2W^2)p0J7uK70bbyidFIzV&)t&3C(9?S0cU!7vOl z4}t)E-@o=F9w$IFBW#3?uo2c5Ow+X5YpSXa593Gq*=$xlUoMwtvDapL>kjzpSe6B8 znu4MzqT)D)#bPnsie*_QM!sSk!cj$0faiJDHuL$s{}qd(NHl0&*99&~5(vXk;CS=q z$@9E3>~O=?wZQTEn+|6bzjNSUrA_c?VNdY<+AZ%XP>IV;;>VAZ6%m|UT7LeO1aK9K z(gp7cipnj58j8YAm9wZuSP!_1s8-k=ag8V`*d1`KDCs6%?&zazU!B_w)=CD&^DV#t XIRvXUhs!)?00000NkvXXu0mjfSaQ}6 literal 0 HcmV?d00001 diff --git a/src/img/browsericons/icon19.png b/src/img/browsericons/icon19.png index 53a72504bdedd7438def309c249ff2744d3f0768..9f74de9069754757bb4ab44e588cb90614956e24 100644 GIT binary patch delta 302 zcmV+}0nz@n0=@!}8Gi-<0044OHp~D302y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM007`gL_t(|+G1ot1ACMi41m;rAQoW24L$&Iq03!{1;~PoWEg}D5|IsL zq`)8y0~ska2*p4~Di{PekcmnLfj~bKE`xYA4H%4;?g!H_0Dt031}ES$On?cO3=5wC zgP^$sn1%rmpHo@^r_-1is0aqeFl6uIR6|ICWNjCW86j zpFY5A7)Tap6kW;;gtMQoU4YNt2cR$ugq8x70FeGbCSabr0Ax6#8wm2w{Yj0)8srEv zhtg65ZV;vA87GQC80iej%MS<`^Z?x;5C8};0O{~Xaq6XNW&i*H07*qoM6N<$f*99t A-T(jq delta 292 zcmV+<0o(q*0<;2<8Gi!+002df#{K{R09{Z_R7C&)0Jdyw!GnX!l$7=0;K71|@7&zA zYHIf4;>3xG>CVpM&CSAwhULr4fB*ph|NqF4kj$8vxNmQ~czEvI+^tzznKCkzCntab z0sZ>==FH6Cz`)Cwm%xC4sZ&#Ac?AOi000hjQchC<;>*bx&VL)%Aki-^&N1t3fG_|6 z0C-76K~xyitmR`GHhdlzY9E zE~upV0kB_^6p=?C2O46}y8*-R-*x0&%iBC+E44RsVY*qE_ppiKn9P$jB9uk`Ln=y0 q=$CjQK~mzZULB^gAlZCpWI6!W9S_g5;r&wp00005wcgmW^dqA4EGcOcHg0t2+EodRTjLIF>O=8pjl% zq;O0TDi+5Sq9SojF={N15kQ6F7!gze#|WWDa8rolAQR|h5$i+4MHA@dSW7bY?caa- z6_)je>3`1K2~yI4XmVH%%V9YzE7-!pVPM}(Wm7$DtFsh@;m|C&PD1I$*o zV5ifEx4RxpmvtyE>+sU;!2I^Ex*p>g@$0b1IE14Tt{&-4E5B!)RD-mYQLz7+L4kF8XXcn&|67QufDOT*`D+nZCM5}TXE z#g7ex2+sB_KX)YooR6aP!aIVZGDQ$TQJ7Q-MMc6gz>P)4!X}7|L`lIWfQv;*58~c| mPQBqP@i2pB$e?(>1sDLOYMc8=0(02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00DzZL_t(|+U(ddZ-PJ+2k>{+#7#PpPNoYZn;R_sB&{P;(@D3=hMz({ z1)l&WmhLPDCYWSo>$?k~wJ4le;SKzg=bcLMms5EF1Iaj!vwy|m73&$g<%s2C*_+Mg z*tRi~MD1~Sga64F)=L|X^^B6nu>nw0I5rTf6~_idHR9O7sEas80Cg6}h@fgXMhJC+ zdq5NiZGldnu!;#jd;-0^PrLNK^?F^+ce`EfebY3-Fbpvdf&hHqzxE>@CqOhKY=n)l z5!M$>)3n-as(-2u593Gq*=$xlUoMwtvDapL>kjzpSe6B8nu4MzqT)D)#bPnsie*_Q zM!sSk!cj$0faiJDHuL$s{}qd(NHl0&*99&~5(vXk;CS=q$@9E3>~O=?wZQTEn+|6b zzjNSUrA_c?VNdY<+AZ%XP>IV;;>VAZ6%m|UT7LeO1WRxgiqZw|35v=sf*Oj#O_j5# zMpzHHi>OxE9dV5)DcBuwttjaxUhe3lY+s$*4Ax2p#q%w|067G!HHXVQX8-^I07*qo IM6N<$g3c+{+W-In delta 406 zcmV;H0crl>1Em9y8Gi!+005uk8JqwB0CG@FR7C&)0O;uG+1c6l_V)k(|Mm6t_V)JG z)z$Fu@Z8+o&(F{D^768>vbVRl@bK{R^78WX^78WXw6wJ9>gs%aeEUsek?b{TT_O4FCWD6m(Kf zQvm4fY5{O$?dGh{Lp8x;=&PhZ;R5;7+)LRaMFcd}6f&#_2a$6P3 z8|OboOG0v>C0+*L{yIt5SCdwtn+z6Zmpu-l4&-!#a}?+9P;+;MgJK+%*JI|Qgpliw zdtTYj)^{Mt)j~IMoZ5uc$N@aJb$TWnHKp<|{a`b%n>(lx5jF zD%_0%4tWYL(LWU&qwtaVDiVTmP_A>nXgO0~MEqJ+=np}w)c^nh07*qoM6N<$f-3La AO#lD@ diff --git a/src/img/browsericons/icon38-off@2x.png b/src/img/browsericons/icon38-off@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..8b6d0b2d26d0dccd0e54f6d212d7c6d1bc5a7b5b GIT binary patch literal 875 zcmV-x1C;!UP)TZk&=M}JuZShgwR_5u;8;!ad|Mggjpq1JF87B|-Z1`o0~OXpEa`j% zusd{+PBY1V+(hwCwOWm2v)LD~k47W1UazJ4D3wa2SS%{_p?b}kjOwEStXwYl;`MYo zE!{^ZlTq$NH3=ML2!>z?hF}PWK`;bEFa$#|41ysTf*}}!DMWNr(JQG`3c-SaiEbVm z2UaK)q_KkFUMv_4vvRq7@OK)GhL$S5h?9P`S|#~>-V?*JEa!f{SE9V9pNs<-RM741 zEmN+g_hlF5w`%^!;!{hL ztgdh#hG_m+!ig)Qd1HCb^bt*r<$GylFq$V8L}r2MJ==5;OA^c=w1ZgEUOY9Bq%;_yPThA=WotSXwL0RcY`9>N`38I`Rb{ zh6A0Q(qkMc|4#(~2kXgiB8D2X_Dje4N|Yx71^{l?M8=0(02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l zVPtu6$z?nM00ELoL_t(|+U(e|PJ=)g2k`H(Lrv7w!9-(?s8c8199%Tk-S`46FHm)I zEWCl~3&!gcXV&c>$5*>_*iGFt>mqEmu6X@kwOEUKD-+%cPmi30|f6m(pQqq8Ea##+_ zVL2=-*uueKV1M6CWm7$DtFsh@;m|C&PD1I$*oV5ifEx4RxpmvtyE>+sU; z!2I^Ex*p>g@$0b1IE14Tt{&-4E5 zB!)RD-mYQLz7+L4kF8XXcn&|67QufDOT*`D+nZCM5?Y&^#Kn&dg9y&{EI)T80i2Jb z^ujxWqB2DgKv9@f2}MQ1GQf>R#lj|ti$qDmCV-1YNe|-Qflj^QEAcRcWyqj-z6BTn XrD~iI!T83&00000NkvXXu0mjfW5nJK delta 383 zcmeys+|N8gvYwfNfnok*$vHqOB)})cwI0Y|U}$1xee>o`m#AnPFK;6g)7Lj|${85S z7#L=mnoiTxt7Bkz`}XajmX`PL-nH@YynFX~3Ic8q<*j|A%?o3mUpx5we!6?_qhMp99EInsiguj5{2FWTu3hn*r!1ySes-DU z@_H}V)y;DQ4(ZzJta{P1%5q_r--=nn#@FTqm@e!m=)#!r2Ow2fhA=Rcfp%j+g&=_#iD2n~ z1otIQiB#J;`!2SVdtd3~p{{E^y*r=pY?By6-rN*9xv9ufmZd1-O-GitEYC});>7g9 zX$)93x!I8=Cz4M~ma2s7rV>nIHQbt&rf`kBXR5Z*lw%FTHEhEK8d-p46pbvwGKNML zVHrUq%doW3$U-bFG_n*cG8$Qo6$yfn7RP;-B_8P!umhULKkt?0wJ_Pkpw z^sa`(9XvNZujZF@O=B>A&DTi-TwKpbXr#qW@&LEg$~nlCPDNAnUmZb$(_yPYr(cD~ z$W+g-l2Wb>v|udP=>M?7ZJI#y#%g+w!+;iyUV&n` ze8Ny2w;8rf9+bv$rtX&t7>?gJUXK~7Ez3*Y&fPEn1Q-B0EFuU>@-ROD0000u1QYa*+QK^F#tVbIAzq7Ilic&|C3mDb+D z74DLLlS_g0$M^GId+%M*UjJlIB18G(WO)~S`5SoPMxga!2%`-!25}Rj&&?GnS3ZXk3P?pF%$_OY4 zY|=FYWTy(*6hKa4omev$J6$33s07VKcpw7`m^Z6IpNWp9pm__#6m857K|Rfp@ukzQ zQdQ*xqfVEx?E=KM^1bhmNBi*6v@e`X2W6OE?qBY1Cq42*9T@ctp?Cr!seX4Im<>Db zi{{PyijWS9%LniQd;lN72k-%e%G@d_2@pxG+x{M$PY7=#JOPMqW{vUJ{OWnllMDpB zI4PQay}E?Y<~=dL0MSg=X!5!*Z3xB_@&njq;`_Y=PiG}qIj&eT(|vBs1MqfRr_X`) zUdPBk?B;A+aj5`)7bzI|89E!`;s$RgyG4xC!iN{20fJv*p<%OWyDSM(9cQ7E!gcIa z&$IwTRaMY@6}=mEfP5$_22rJ+`-My)h@Sa@N~{2c#XQRC{{iM#jaZCAw7O!k5-~Nh zns)@?g_uO-T>&J5a5V1?gfMA#bn>m(uwfaK z+Y}KuwmB0ye~C}%+i;;Q(Z|RjOxM`s>n&DS9i1ANrd7<$f;=S-P2YXzYPfEE-2eN- z&HeLBx}?ng{@6V4uC<)M)L_o`aF@w)QX#KGvXtyUuH3V1Q~B@75;LlTGbR3X&vE4U zo_@-zQ^HEW;eh@n=XS5)9inaf-Gpk=Sy?`OU%7^({IU{f>~j_omVITMLLc6GO=!pu zZ(^z0Eu`|`_EZJN`|DUZf0U_u9N4by$h0pORf!g7_&vryKYLazsyfAb!7KJn(7C-V zGa2@=uj|}w_5M3hXOuCI%9mhHhMK>a<}Ea0-Ou~O?a*G%-Hz)Ibu#=~?8ona@K{7v z$UL7}3PK0|T9+0W-V=#k$Ff!a!&?(qIdeze4I8GpneuP_|K_S_U~I&koo~*cU-;we z!ueTypXayb-+F(z(c+)khP^LKJ$*04-=6>I*y_Il5%zpFAKx9!TJ`nbFNuAb@!QOg zJb%0GYwUuiFa{3M6PJ+(P?ZmF_* zI*UO_+wMPqws6$V`_32lOzO|Y=jCsARKA>Nu2uNy@7cIF%ebo>9(`DFZ~a|e6GyW{ z&bRK{M;$J2=!!a{>eB%>8%p?(2jhZd{s+THEE?NFu)V5T~jXP?>0@*t4Pd*YtXAbhe?P_2#{@~2&&?Na|B9nrn z{hyscQoqLU&CA!N=T=CV#Rp8=*%Z?--=iUqGj;XPl`IZTQ9nSW)sK}xT~a@0vN$-E z{g}z>;AHm0i)BiLQ`(PHEK>rSgnoFjPVs0m`f-YNibGS-k0=(Ah^C?+w^&31n#6uY zv5I&!nfFFpH%bKlwdMVAV_^}hI3sx8@x3*}JbUH)PgmqVI=kfM zTJF4=p91FeoH%!S#hZ^G&ct1*l`nlVpMjad_*2egbt(OOz--Ro>FVdQ&MBb@0Ca89 ANB{r; literal 0 HcmV?d00001 diff --git a/src/img/browsericons/icon64.png b/src/img/browsericons/icon64.png new file mode 100644 index 0000000000000000000000000000000000000000..cc78034f0da56e54ccd5585f903fa1410f04301e GIT binary patch literal 780 zcmV+n1M~ceP)|$J({; z?j>)_x~$Fb*LUsR?aH7{aW)2d{O;6(z9IJ{>Gi~zhR35*E5YYB`HyekQe7`$T%j3B%t35+PbZ3&Dp zye$cgIDAV9OaORG2}}_9ee67G4(@PFnEkZJn>!X zOwI;~7YUvpSOHlOH?nd5vgF5}N7r`@+aC6JTK=woYF5eSc)6%5=|iOAeyL5aZ@U&? z`0YOUB>-X|ct`La|})!_5B0o`0i zV(3>0ZVysK-~yUO=mUk^tmPCzk9B+&y3oRt1Ew zAiH)E%<-%V1dptRpSys%?mi=k1Z2!;&l>#P1_hDu2j0*RATGfGZ`u(eD!~*U!)l=< z_Ed1ul&g`6eq65&e!>KADWDw^!hGg!322gV&2xkrysg2Ix&!PdG^oMbs(_|Sh{{4r z+whJAL_~rkc*g=lE&-v_9Ny84isK0pet??VPiTY;KI0VLRRx5w5;S;M9k-}II_nAE zRTD624(SffC*U!YUf?}ffUX+y@V)NX@98z1!aMc))VLO30t^7M#Rh}Nd$8dE0000< KMNUMnLSTXiV^w + + + + + + + diff --git a/src/img/icon_128.png b/src/img/icon_128.png deleted file mode 100644 index 165e37d81b14293caec998d9c73d883ddd791eab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 880 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&^#=HaxB}__q<{vn`aKmD2O1jg z?AX!5!SUq8i60+6{Q3E_k(v2uXXp03ylyeEv$JNMm@whOf(56iPCeAzJjc@V^0H;C zLP8e1x!vEp_u85@zrK9gkeK-K(W4t1H%?SmzO{AhtE*RI*JSho9VAc^Sw}T!zh`2pm(V$_RY%XBgUL4?Z|Nlp| z#=CH5d zVc~hPdriyTe=TDArT-e^Rp>f@kr-F?AT zkfsl94h!qOE@=G{F21Vxza!X#HI$7<)^f^VX$WmZ(~m z<8|jXbk6?gwEOL?Y|GN=B!6)8*3PZP#SibbJzYBW_P&}^XIo#3Hb~hY*r&UmOJa)u zc|ie2bo9ZPfj#$tm-L3KYS`0t3-#WyLBy66jIjxL6 zj5C4#XVSdM(^)rg{P1U}PIahX%w1tAQ^F`bc@@*Nqow*h5>aLkwb*Z*d0Y7N)#q8B z%xB6j-hY4p`0B@{rvGlaFclanF-o*EznR1En&EHYeug{I*2RoZ8smahd|9?K$S1~q zHJQAmvV8$tg21a>@un&UYp(Cx)&z2hZDq`yVaMdiu>Q9elOe<3RSLz-KfVj@VEpr& zBZcA1er^>8<6rk#lldF|XMaD&%f#LgFMqI!{@0+EtxIXT}Vi)q`Z#|os8NRw-AtT;*!;zc?&AoK6Xk4HK?4>mQu zy>w|$MaAK^wtdyr`x_dLPn_7m!0`Y7|1&dYG%zwwP*9knuD-y*p@oCv#l?&JYHJ@J zK74EI)?O(or8=7mph4UvL4Ltc82I+?lRkU=@PXYaipOPv!ug&qjv*44d(V6GH7M}7 zUc4UW>MHpE_x+W*h8Hb13GZlcVd&^!u5nt+_}1*+bW}FSW zj}3eeXITGfpJTsay?n&>WNn3$4}0uZvWK74*VW|-+Sq>AS7CZl+{Riz*9XdL3K@^Q W;P|OqozV`on!(f6&t;ucLK6VV=x}ZT diff --git a/src/img/ublock.svg b/src/img/ublock.svg deleted file mode 100644 index 963b3cd33..000000000 --- a/src/img/ublock.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh index d52a3a8bf..b1f1f8946 100755 --- a/tools/make-firefox.sh +++ b/tools/make-firefox.sh @@ -16,7 +16,7 @@ cp -R src/js $DES/ cp -R src/lib $DES/ cp -R src/_locales $DES/ cp src/*.html $DES/ -mv $DES/img/icon_128.png $DES/icon.png +mv $DES/img/browsericons/icon128.png $DES/icon.png cp platform/firefox/vapi-*.js $DES/js/ cp platform/firefox/bootstrap.js $DES/ cp platform/firefox/frame*.js $DES/ diff --git a/tools/make-safari.sh b/tools/make-safari.sh index 5d774be57..d73fcfb00 100755 --- a/tools/make-safari.sh +++ b/tools/make-safari.sh @@ -16,7 +16,12 @@ cp -R src/js $DES/ cp -R src/lib $DES/ cp -R src/_locales $DES/ cp src/*.html $DES/ -mv $DES/img/icon_128.png $DES/Icon.png +cp $DES/img/browsericons/icon16@2x.png $DES/Icon-32.png +cp $DES/img/browsericons/icon48.png $DES/Icon-48.png +cp $DES/img/browsericons/icon64.png $DES/Icon-64.png +cp $DES/img/browsericons/icon48@2x.png $DES/Icon-96.png +cp $DES/img/browsericons/icon128.png $DES/Icon-128.png +cp $DES/img/browsericons/icon128@2x.png $DES/Icon-256.png cp platform/safari/*.js $DES/js/ cp platform/safari/Info.plist $DES/ cp platform/safari/Settings.plist $DES/ From defc2de65d8d11c03ebdb56d4a4170e43875598a Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 6 Feb 2015 04:34:33 -0700 Subject: [PATCH 2/2] Tweak README intro --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 721c07891..e0956f1e2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -
+
+

µBlock

- +
**µBlock** *(you-block)*: an efficient blocker extension for Chrome, Firefox, and Safari. *Fast, potent, and lean.* * [Purpose & General Info](#philosophy)