From 21ef1c8e41c86f81deb27358377e69257f0fd984 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Wed, 12 Jun 2013 22:58:01 +0200 Subject: [PATCH] Remove alpha branding --- Changelog.md | 1 + app/assets/images/branding/logo_large.png | Bin 5772 -> 0 bytes app/assets/images/branding/logo_small.png | Bin 2811 -> 0 bytes app/assets/stylesheets/application.css.sass | 4 ---- app/views/layouts/_header.html.haml | 2 +- public/500.html | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 app/assets/images/branding/logo_large.png delete mode 100644 app/assets/images/branding/logo_small.png diff --git a/Changelog.md b/Changelog.md index ed677e59d..c68b38c28 100644 --- a/Changelog.md +++ b/Changelog.md @@ -20,6 +20,7 @@ * Don't show hovercards for current user in comments [#3999](https://github.com/diaspora/diaspora/issues/3999) * Replace mentions of out-of-aspect people with markdown links [#4161](https://github.com/diaspora/diaspora/pull/4161) * Unify hide and ignore [#3828](https://github.com/diaspora/diaspora/issues/3828) +* Remove alpha branding [#4196](https://github.com/diaspora/diaspora/issues/4196) ## Features diff --git a/app/assets/images/branding/logo_large.png b/app/assets/images/branding/logo_large.png deleted file mode 100644 index 7339202e57483635758ddb1dc3868cd2c76287b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5772 zcmV;77IW!|P)(yIQu|yK1Gbt!2B~Cibb;YHDdIspUsS`kET+ zDnx=*E`o|$pg?{rps2~0#HTob!0-+7{-5C)-f?zd?wxyPhTR|M_xu0g&fGcooacGY z|2*e8A6Jq(Qb+1Y9jPOAq>j{)I#Ne6q^72(VZg{%@N1wy&_&R*h60^c=J5gWsG#y_ z0AFAtumo5R`~~<8;9^7FMz(?8cFh?<7$9?z#mlT zN=}_B@FxLSOvEF?E=A}Wzx`WdV`HSf2~b2?jq*l$mk20}a62?9-(of8tFNzrit>T1 zrnCnRprpyl%6gazRZvh69}^R^${dFeA6}J`lClBcZ>_GbK89QCS%@k4^OP;mx^d&i z|Ki%kmhx6sR&FyY5@mYGR__VrKR|iZ)zzgQKYn~wKtRB_K{{H@}!^6YZ>vXzE)bj>E>nQcWN_9o`Id$sPR!cZ@=FFCijEtRC zRaJ2?NF6`tB6-nj?NWfAwPj^xE1|4eBc@D#C0LBzhzAW}86pdt6*xs5eRG`lWDPNe-z% z;^M`NcSB)u=n#I<#`QQNGR*5fN)BpUB9_KwNim76+Inw{`2*y+nly3k&-R*RKJy% zEnp4s4Uj~FoH})C0zA5GZd^wI54q2RaURF@ok|N^T3Y%({eJA&vBkT0?=FME*PTCq zzK@bT;2Hdu@_;bYnDnB7HvwumzXFB>QT2M->kPWcYC?OCuLiYlMS&Ye30 zDIe(JOI&w#lDu!N+}gEk|4Nze-@iWr*S)!5=D3|n%L^C@1dylU>gsw0J;ON`V1$+7 zM$5B)_~C~WN=b0vzJ2a!#D%DEIVo_|s8Ja_wEjqmD~b*U<%q|Q!*4tgcgTQ9sim$J43hGZiejW1sog7`kyF1PG>DCHJk9PyZ zfaTP&eD>LAc^qoksMH`;=$R%ICIEl;_xGO<4L~Bl`G877}_S4mzOtiZ|GyiE6}jZey1_6BuI`FKA_%f zLGRwZ)6knWR#sL4}u~Md%p$r@RY~aU<6DMZS z^N?pDWO|!GU1^z+pCuxMjO#F5xuP`ot3uCOmg&-wBS*$3B_(AUNia7zw{XgoDO8V- zfuSy_19m|!CNTAaH;ytnKSiKQBk?niGY}Qrl+U(5~OocHt9?flxv6Wfdoa$TWIB| zmmdUt_sJ)p6jMHWz5Wx?Bv@EjIF^2gAx!~$K_t9;v|4Q_Dqjtc6vIy$<9gV}>kzf4O@qgm|AtgNgG)RiV6p0XvFY-)tSBsVv=OYq+H zAPfD43m0w^-C>bUgoTCWb0B@3qx1~#b~1Um2M!z{au0(|R$`b}kN*#^S+iydIzQ?F zw~A1>K$~gsyFs;a7?wzf8}mEnfX-UYenaCsa0_U#*o zYhz%W8uard6v{I{KYzT8ygXle>7~6OmL>@8avQ@zN6NAH@#Dt}$ZMK8bLJq^FHooF zDbEE97UXkKyQfOx)^I3e#iB)v406lM%X?0A=z=<%Shhd{@&;k5Xz;IZkO|}OTY|{?g0SSthxA4kQ!=hFBiw_?@Op9il z;9dMiRKtQ7G=yRmk&%(bQuB;tHh{+5RBUS3`Ycw$DxtR{KygZuR9a|rdniC#3qLcVHAum^^o zdX%5Muu*ct4g&N{o$(Vuu+%&=J`BU)eW|Ib+4%oH@_>QuQu9iHZfXQ5*e2Tx3ASd3 zPA5S-$lET$CxH#!uwg?E<&~bE{$^XjRRs-8Q&v{Cg?=+;%ov)^_cIH$lQ0&M8&5qL z6!=RSUh8eXxE{rBHbq!{j@-7oaz^G;qI^A?7Bxomj+l>UftzNx) z8!tqTwopOE4XdQ2WGUVM$}6wXl=$P4<;BV*lt2u@^&~73nhdYCAFx4cUI?AMV8Mc~ z^7Hc#@oop&1yhDUn}I?0k|XW1fl<&innFTC$Yc84jEua<#XoZ7NR9=g6p?zz$H(W< zs(bd3RFfd>DTnOx8XFty=FXir0i8pq=DxHxl%~@W|q4`jW|>;Q$#Y=qQpSZhH`9 zk;I{c5_flZb9r7pBT3K|9-qT}ZG?LPEku9$PuJc2oep! zzkj!YL!=|lvjK#A49cYi#UC=!nJT!?<;$1#1qB5<3qt@A$rE{(T)K3r+`^Exr9N^K zE$D`48PT_IUm`!+&-?<%9wjI1Sy-}TS%s6JKs&r8-=Lr%@)i$C&D-vj;vhy{SLKqR zqijPY33koR%{8$6gb5Q?O8>ewNeKzk!pJi~gO`^V9k%cbE8~0;=B%w-w;GPcLeDWn zNuXP5Uif_%2VEBc`+&<3Y6@KI)4VP4U>nDW$s!HpQHDAt!n^zC*=L_U!h{>ffoSuX zpLcY0bRNZNKL7mlA)*^JWHpTPMgz!cD+YAz*s*NfyDB(1_&sxM-@g65#KgpJc-tj4 zA_`p7KIhywzzdmi;lhRan>KCA;GGaB zB-_^0xiES6<(}uDMx#kjN=mxMdtqO+CdZJFkb)jPdi(>}W(HC^Ek~iU(Y|Hc15A5u z2edL|ynEifd4|(pva+%kh;Gr@+1U#z?>F9f~N=r+3wi079C5=ipE=xyFon!+fPx%QR z=C!;=A<@Ipyb2BnB?hw_WVJtn6XF*w6S$&r-UDjLBMN54mA|j~lFS2)M zj_JUfS+iyp(Y?^yVM+c%olck4isD-8hT$a{7@h7i&(N%-Vq#*Ba@{l*peP1KM(gJ0mWa-!iiz;|0tj#tpU7L; zsZ*x}ZWLM-c0oiqW8AoLS1HB_5A#BJc(~OyjqOm+&Md2N5)^2M4ktlJ+lH#j;b-0; zz*v)$sbe{4sHkAUYe6%y3&XLl%CGjg8mn#L>qddn}tf ztZpjnL$ajV<I+bV~n^eiGdsI2W_+g!UKL1);8&6T6Q@$?M(ZB$eg zZScP${r~9>k}V`yQc_|F)-PGIgx1DQ;vtt-A@0>^G!gK0YSHLR%+DF4Q6PGVv-E~J zxt=bai${BSpMLu3gZQYI1C3A1!_AmEbLP--P<6C+kzU55M78>Ca`?(R;<+V`>1b*JIk3wV~{q+Fd&_nIlGz)M-& zT=bi?y8Lf#y_OQ+4a7Z$6N;BDTSoD-_aw_li`&ci48w7NhQX(%O`DcfQ(IHaabJ2j z#Bdn|NUuyi$HQseGtWGe%z^PIrGH%%YioTptox1Iw{JJBKdY*$T4U)(2kBWza$s3I zNYIJ4(Nej*yu6&s%F56AFac9+0AcLp1(v18rA8MoUOf500}mLFdS5G9Kc%@%5-chz znoi%*Iv-rVEZKfwfZ=2bPfyQSI@*hl%rYq#c_;Jy{rzK5*KD&ba#S|jL{4wjn#GGs z>+yXxlyiw=4r3(C+ji_pf*LM2Ej~UwaNxj;r%#_gY4W10B;M6B6Lg+_r<9bGh|!}*e~;hL(fn~d#JIys4{K|EXwqoq(xpp_$km2y*PGYF zL3$P`E4shePi7y zzh#o`Z{xB?gd`_=andKO16sr!{ph2Q1}QMkn^N zL({gqTt&V{nNmLH$HO_zHVj89F#-N0S$^+u3KKyL&(^#F{1;CUbW&h+#%D#bt82Qi zv^y)6ye`_hCgMdnlqbCs@}OB`H0~LuiIJH=2oDjBbxmd@GI2aCgXoQQ+sngNy9DVu zk!)y-AH4!Jfc0V|L{p^jqI?^$k$P2HOiZowHSAC zSVJ=3Z@SLYUUq1j?_X5pOEKuj*)GSM#iX5T8*V(D^=SjN1mYfUNVlsfAU(^A^Dre9 z`oAZCC(4Mm+++3T$pwvt?>(5zX{{WchD~ouds=GV@zR%vcbyd0P3cRJZ1oD=SjnWD zU-Lu<9hE diff --git a/app/assets/images/branding/logo_small.png b/app/assets/images/branding/logo_small.png deleted file mode 100644 index 0b22962be06ae905faabde36ffde7843b3fb7510..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2811 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 N002ovPDHLkV1oXSW0n8_ diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 8727d08e9..262023718 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -153,10 +153,6 @@ header :display inline-block :margin-top 5px - .branding-logo_small - :height 16px - :width 161px - a :color #CCC :color rgb(147,147,147) diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index f6eb1051e..bf5d4de8f 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -5,7 +5,7 @@ %header - unless current_user .container{:style => "position:relative;"} - = link_to content_tag(:div, nil, :class => 'branding-logo_small'), root_path + = link_to content_tag(:div, nil, :class => 'diaspora_header_logo branding-header-logo'), root_path %ul#landing_nav %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora" diff --git a/public/500.html b/public/500.html index 1e0706125..d90787b1d 100644 --- a/public/500.html +++ b/public/500.html @@ -34,7 +34,7 @@
- +