From 1e0aec0267ebdbba9ffd8b84932388a45dbe689d Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 28 May 2014 16:32:10 +1000 Subject: [PATCH 01/73] Adding in font files for custom font --- public/OFN.eot | Bin 0 -> 31132 bytes public/OFN.svg | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ public/OFN.ttf | Bin 0 -> 30984 bytes public/OFN.woff | Bin 0 -> 18936 bytes 4 files changed, 59 insertions(+) create mode 100755 public/OFN.eot create mode 100755 public/OFN.svg create mode 100755 public/OFN.ttf create mode 100755 public/OFN.woff diff --git a/public/OFN.eot b/public/OFN.eot new file mode 100755 index 0000000000000000000000000000000000000000..5b07d8beed6779132ee60b39623f71f16ed01867 GIT binary patch literal 31132 zcmcJY37lkCUGML?x9Z;7_oerxYPxH-bXRp(boty(;%gk&Is0RrdyG=9x$f+Al>-o*FR6nukk(kf;(?LHS?@LyqipOJYRF$t>1o%Yl-LExu$Nr<25fXKlGv+ z&!pdV|Lrfj^@Yy&{?vCl&Z|gswr(fE`&&29^EEv0x&6+&Ui|`-{Cl2N&!67$@)z7% z_`S7{InH-Jnddw1y!F+moSVEmcz%HArI+1$=Zo%sSNH$%{0ME-Prdxx?*dLful|DG zJD%&9dz>Wit}!nr<;v*#RcG4yFUmLZF{OzIdwarhKHoKup5dQ)l-j7qriVXzcI-f@ z#TxDEZOutIhqz{(6z^!>S^9kU%>O%chBSwJ$KIPWe>szgO4t|t7{`#SXln`6AcEmx z+vIk;7f!1<&Y4GP^if7^*4gXyohLiba=w)zexvga=RM8`o!@f)xAP_EYbI&R)IO*c z++e|LcKEJ&oq`t(k9(VgcB8gnn!^RJK2Q>0-XHgdLA$o#>SoOw3^xa@HMdi6YeB~r zt#9^^yF*^7GG(@xL0e4>sA{vX>|PMG>l>=Y?GFQ6l@h&H!L3vI=EiY%K*n~N$_G@q zN!~hDw1;(7PwmZu*RF4__SZ}&EI+6}md+ItiBu-*pP>Gf=XwdxbrW8~)RS3KyT%wd zktpQSem0XLJqUt?-n%yE!bN^68@Nf|r=;svy5!0xT?(Z=-%omeHsxPLR`U*Fj3c4NAP{RW8}s(ZV}+ynmf?`F^Qf_Cc~|uG_Bah8?Y%7f$wCy&s*f zwby56*4wrC`lX4^ZEknwJ+>QRk2J?4I(MC>Sk@(`Gu%l+Rmi5-hK_n7q@F0LSO2pc zZfM0=kFTc-rNYmaDrpm6f2r5|_%1*{QL3a|a@-tWnWVWf99`%6&JQ>rc7EOY1Te0f zBj%arN6jxW$GU#kANm`9Kj`~?f7se;Z3V-i={IVP`bJ};F|2KMw|aaxhQV;%)QA46 zzZ%$5>n0d>wi+9?O@FJlRo~h;Zid~h)veBOwZGbLGX+|mV1v4c{ucFb@ylJSAB3&Y zl3K29@n)ko3_3MxQLa^LZT08eQ|EV?wd z5l~HyhEy5AlQCE~UBBh`__l(6Yqd3K^#x|I)fdRe-R2f`EO=_7VCY=S@A#{&)i&J# zm|>?`A2y3--EA_vgO0!Ec805zf&~T5&Z@1t<~LM4##&=*1FZGw3s`Dc9CSk*w}xuG zJ!}qFw_+?c*A3X{TA=G8`07aWAD9pNr$772hZoX3m;n!YlRaQx>nY1453b=Q!)y!d zrDy3AS}Wy$)g-gI^oP^A zY?AaKT?l?9D8OFKWk#G*n1JPosd^^qCM;^QN~0Q>O4NtC&6IGHCXv?5_?>vtk`O!x`A);Iv>Rr|J$sEoUAE;WdXuqh4wR?!0`F%r}!Xj-zUw}`Vi z^Ont?mf2%AR!nPPKAg&D6V%|Ri%bQJX^lW?WiON`G`lllc{Lv5UC4?CLQV6SGbN3V z8k}NOVwBiUyDn-Ee-WRoIs4E8PCGyCI8`RHrnQyN%(GDPGQ%Z!5ow{|9X7TaTTKN0 zF~bywB>`sihM9^yms~G!u@l=q4TE|x2nNkTv)-%+Oz#$=T^WWAr1~*WdcxODDpyFQ za%m`4cR@Zy4`NOnU-y^i8~I#)t_&g(YX}vMfI66O7Sq|5OmoWGcC|TCb$D4q1 zHF0BqWFkm<$#gDA2EJRJZX^;xDoCWJ7WUL)Jw#ya z9ET(47>6dxYzdLSHxEnp_>G%Q;3FmKS6)zMn}mB#dQ{E2m>B ziLa-H`=88K@+oezKbhg?NVYm%EX-6994}f+5aNr=Svwcl}s5a zs$}D0c=R$Q&0z>1Ik-bM{`KwIa)GIA(z$B-r_)s?I8v-o&h}^XvlV1!t}>g~luVf0 z{Zt^XoJ?jCFEMW5r(A5d?fEwCtYb6no^u|y3gP{^6p#Ow>4ya`P%$pM`~2eS>Y^D2{DtGJMA9-Ao{=DoCS6C935{3NtLVa9+r>m1HM><`PjpwitHD4# z896NU4aG9B12*alUa!$_bemlgYTVSjsQ!cIu+~S_?RU4j16jvgJPySAH?}sEuo=nX zs-$-e4}b)!JA7xSvstU`nXfeW%F5i^tjzDJ)Rw36^*tN&^Ba5W`KjgFFW1}M+1YNp zo}XTsLP82_8ZCX2LJ8OG)XH@JjWY)p%h~!ul?+PM#pbpTsYqCcDbagst1i^D<;4Rt zS7mE6MHqKBzMf7OYq?yln2xW{S-kAB!wrn#DPyKEiyMb8yKK?R6>8~XL&7#)ZWPnC zLeBfjOs~~2rqSxnlrK7V)&8QCb}xyE4?yXxbR)p8?Z5Kki^?M`$UIUgpUqgM3Azh) zCzoNjeK4j_pex*u^?7nwPR9kZNg`%oGS4l{R>e}PvxU-h4Mvu&O_xl*TIO9)uI4k1 z0_tR@(8!2Kr||0J-L!eY`7yH(UFs?3mFAu1cg&ZeBFj6V1xX8-G|WTHcYEc2_n2uPbGL^5Lk6;d0G6SkMN~56jV5nXR%I_rYliySyb)0?xV3pBnluHs z)n4fxayNRLkW$F2PzXaG&iJvpdBp8+4zaTOo2%GQosHFv)y*}x+g>*^vicpM9jtll z242zLfUFK$-((Y^mQN8JJv^Lr>lc2LH zhO=(k&88U7nkV&U3`x+i2x`m72T|4}g&T?A$dP2dL7*}C_ZKx^+V3XOOT-;~XvAs> z-$_z3p`;)eB^?cEN)!Xl+xc-ZZXg7el=hb8AeNeBDIMi8oIiG=kVk(a&SWC#j@me9 zU{Og_!BQ$+D&+hG56?~}(up8jET&WCd>*e<;JMS5BBRNs>P4s08N(|yi*9hl{>n-t zH$E>WgXnkk+cvK)6#r1*k=L1nyuKu?hdY%rT84@i;GH%C&{2svWHH3 zH|VW~=8#&kuhqqbYi&qMsB6?A%$Cq0v+A@b>5|Ci^ZxD>D%<|hP~zL|qsoh)V07Bg z3qv?2vbtvUTN>t5CzZIR_ntRXVi;UAIPu${7fFaq)6Znm^j^v|=uS%!%aX!t_oRqY znzAG%P@*=X3{R$j!;{~%n#AKW&K+mIVBTRqjsJVUa|!y>ORzP6!}%vXCd*iyFeAxA z=@(XG7%+{`a`*Nm1s^9%@c3DpQI?{?k7QNXKwK?qx-(ceo8l~k-kRG#3lPgD>*S41 zsZKAF&WKv8;PpC>-~5{xE71*O26^!#eJ&BClkxRa0WN4C(*pxo*HpHGFW(hU9N`XYgyDi-p728$g>b|RBbC*2~( zLOPkL7Eo*R7|h>S5Z^^jOQ9LoS7uA4%F=-;8K_AQ70xq1oWW4ZR;Ke<zzOpT}GsBB7AYx*0vghVUyqZ9x^Ihhi$T1?v#UJIVhtn49n*045GNjyMM+c z-xF#g8rL|@-jCBq58iw4z4zQ>9_9Pn_7(XqzAU`E6qK6LYeVHFOgefryz2L25sPbH z4?A+JTcfugGOyekj^1|I+%@{0p?T%u(OaD~bGb}kA7CA7!TBZUPt2|6Rpu?`Uh`pQ zaeLmNb8c-O@o=Zs_Zxh@7n{xIey^QGRv(jPCRGNnbi2QG%=Dz?w)b0SCb?Hz?L%HK zRBt*%w1xww-reu^iufIBjcC4FiQXI@FT}4nx;@}NW>)(^0+94YsztZeZDHb>ts$yKZ_qtrts4v< zSVPb1RmY^X8!ROBsV+W~dac{&O50LOJ(yg>5=m@MvOVQk*~$9qF;moA<^HR0%gxNp z783Hbm{zvgXk@Q#LZnb>O=4agMhj7iRI!Kwp2gPLS+LgPTrS&qmxl|1OeOC;Ou z4{F2cL%F)_hO#2WHHAlYZp^iSZWKWVVe_12;8+p7xb<4dGFHtSeO7tG86T|30*)r+u(p9^9c4ze$EHOz8=I|~-wh&> zpVTbe@2<9CH2h(<)ao+nv4$G(BJmW=oBp8LtsOEwnA#z?-wW(@qt|Vb2IK22xEq*b ztm=`y)5TZ|bJlu8o3qvHZjeSFnrm(==T8jd$0(@OHtm5AqQc#>-HTO601L1JCJh9oBbL$=0sNYjdv>gy40I-c3 z1FP1-TDO6AC4H*d>~665NppfirW~EdtfWoSz#0}M_i9z)1pH}*QBVx9fCnqo!XGlp zwq2id{d!V0Mao}vVOVVy5uHUBXo1nSL=#;ivT>c_%t|w}xVJkq)7`t6X|Bj!u`}h2 zQ{UT~%fMpMF`D&yI$f_fvq26eBQw|9TYsnKZh3Z3-LCyJB~#^cmC02s_^9V@&M&~c zlh`oH`koohZ_RhqcbII#8-40OQrct-&BaP+Dq+bcQiXgDzVo$nrvA&T@xCY0xWbc} z3_ipFmC8$@k-g%4FR)!?H;F&;m*id_*ZjbF(qD*<$SRF&k?p$-j0k?KT5L61t0^a> z&+&tFz|7wDp2ez(i6z{3C6LUwg}U}xs}BxOT_-UQb#|St+Apd8Oln8yquD8<+)n+u?v&Z{pTv9 zx*oj%eU2&ivGcY1&ht^9CC$H5Z-jz#)9{i1Na5eGSlWT3Th5iZ&zLvj3}JA#$LeM0 zNV_W>`3nsEIbV4@sM6Bs-U%{$sx8J3x&Ra!66M7EBj+H~rz-dMv>4BdJI<3nJwbMz z9h1;b%o`_Yarqm`dPFbpF!$S5r29Y^i0qxq>~c8&iJ1wnvib+X#^1nm3fR$Hi%CP3r};Q6#m3X|F8v z7O_PL2;VLF#5>Cp6Sx^0goHHwIzps5?6&$XE0M!oE|vvu(wd@OYLeyrbz3#EP!!=I zxz(=jhN>etI|^u#?h!P7!GK(eASE$^uzl{Fa^$uh=>6I zbMNRk4fZIUhl{y%`@TH-^Dr8vHrFoZTl0#ufGM~*eXSS3Cbw-e38TLue8e=Cmvh!y zfZr5bi#1gFeI%fV5(c&cZj?3`|;f^>b&`uXJgO+!YwG}w{WGdM<9HzLQZ%c z5t!k*N9KE-#Y}nuZQ@A$Hcs2Sv2a*vrQX8E>MV*e2(#bx+-i4jV`HJ$nc0>41tJ4V z<(jpkEG)K+Yckam3yi{qxe9@*l}J`5v$=dQx;F+XzCNIvQVfp0vA~|4baHpDUpMBa zn=}eCv)t$D=6RvzXRK|mfYLuEvU8EO-Zwj+F)6cz3z>LRQI^!>dRhAJvb15m4Q{*B zTplV8t}S{dDVk>WvQ?d|-iZ=tCqZ2S0CjZThV(4^7y8$w1P_QM*cvEWOHO^LxWIBJ zUz(IQ)<(s`rPi_b^f9y5AK1Vzsba^i8jPxncE$QbQ<|Vv)HHeJE5Hq~IS5rv>&~Yw zIp@?AInW--q4!}GYP3m&DogG}fezZ6?GD$@rqax#sZW186?>A*!|~mtA07R`M;}A6 z@J1)_t0CSIy$|bd^sq&=Y)&jA++iWIHOSFNcN&ZHW>H=(Hbb^5WC>J-!pFE4y|cB3 zKQ=4xt|w8JFh7k_KtrPS9i@59*c?fsxs*Hl^p=*Ey4|H)&0G!jalTqKC*Jn9fTfBv z4pA6*2vBI8AfFAs`@6q;^n7dF;v_H*`Y1lhAaTa|IoqHG4d`Uo6Hg<5xLn)Tu`aX- zsPRWn)`qvyvYr+OaEvG1E&C$uVwhRou!XJttDgwDXID4IuC3Q|k4C6Dxuj|=Dm0Iz zjPTVRX?w`DWZ@QXVt7ogv{X7-y6)tO6DMV}X7w{MS3cl8NW}AvX5?nvmPEjqX zcb$kRMfX?>5&xB)j|jWaMzey3L`|UqEv*jZjZ>(QL}WZ4fm46h7L?sI#DLrC$zZjn zbv!$+(uPfR$+m$b0MyTYPb!7R4)5SN`IU|ZHG+7c9^{K#in$TH%P?MSZFo*f8{!2T0&!5DkZ)kZgjwRs%>+PX1+f#bQ5 zZ|`X6HC++ks=U1yR&D@tNM(qq3GKC_YQHqRFR;g)VZHX&<@n;M%pvmW^3HcJ121>yET7J>h?wnq4lFJ+Brs zIg`nKa`lqltTD5_OIG(>x;~E*wSMUyvvhR-j4?C&k1n+iA5;L+!NV=Wd6-Phh!F5C zNHfF^)Za5F3ayn^F-IJJ0dDOPeFS)k6nVU2-W2nC4L0p3J=K`bF7$hQ%Mt(nC2V_{`MLSblR@5-_N<%;5qe@}&yzst=m9fx;OHWFoHk|}JT4wRFk{|*C(Kp- z0h_O2V7I~sK_yWi?uO>M@7&BhzaO8$lbq|ETbw_4zU=%fGh8e5&7jEyVF8kRt(O%I zA-E_9Q2mf4SEj(CvGH}N6PKVP5Rx8F^+mR{g;STpRar~(CSn40iXZX@S{6KPx>~># zTj&M7v0B%Y(j$g()X2E%MPUIQ%~@9eaDK~KzS$eLH?%ZqbuTI%Xu-4H17NG`)tlrO z&_U1C@}-5@schPywmMLb28LWOkTgsVF46%^2#Z1P` z`?++=O}^X<%2TbWW@oPAnSNi9^+Z|{Y1_tGP|D*#c(v!3o2{wZp1CrcCI0xOuB)Jc zTq*0j{)as;SF8~4nhRY2F7sbCwbs1)(%#0xzL`?;W-pVER<~S(C<_5~O|DkTx(BU% zp};|}v3y`^Vc%@Ye})@m2u~(wFYG@>vSpxPTbpNo-y>w*PvwYPy6RV+&SF1nU3ta; zn$u!e1)Jdm_^B>p-{cQEKj}Q;{530940uQSIW*CP>29{Al#0b#Dp4$&O*$)2wGBzy z_XW4HXxaqPMa$!&*m1!{14&tXy(77!R#;gqxYk~mJBy_ZdvCpAN0A~f<~f3_NF)oo z{T4!L!7N5DspM|J%xxapl?GMZczm0QgTHq`Y?nsd-mSKb8U4ZpxcFp4$O9lpD%~N~LUAQ` z#PKtamtyKysEi1Uz~G$U>7bS1<^mYibA?tyr&5Jn%6%YR(86dT{Qz57lt|}B|Ciux z#echxf4Jk>+ZHY8M4SQ`&!OJ1?jj>)|;mJ!*R*@JU6X&4`Q+S4qHDY7jNen?X`E8!G~P^mxq(R`xWr94$O*Pg3# zisBS(QJtcvFt@UXMGDAmnzljauDSawd`ADKatm73ccUAxA2+iwzA=Z%`ayH8zP8wx z3;82g7NKhR04<`u z(YK_xM4#we2&iCPwUwgkGwp1Z*iMFhS7k6)r|AsyO-+@ZpEZ!<0`w>^&vA z)-x|AxvVu<^5Q2965r#NDz#wvD!d8ML0pWA*aDg{-${Sdi2=#79U|dlGbyWW(f(4h zt7JEuE&3lY>1>59aq_ThCs3-AO`EIHfpf$Qvjv2Bzf6!MsE5QSniI0*JccDFX&yBn zwfwcb|s?5!+Um#c{FO@*Sjn^oB7if*kK?RI0y_IJNm##X_M7oA4B@{^B zjqk3W$go|CDu2_AF5%s4M{lT@=ZxNKo^$opmDN>RWM+Obo~%#&=Hf~P{5%t#`xnu< zZ*=Z+e$M#-aXt^RpZ&L(zcwtcZNu!_Y-eHH+qU}C9;-%^iD4ieQ>}`6)LUi?c!&Ki z?W7j^2>EXvHCAsTY@|N~7vYCys9sQm$!_n^>1%GpY*yvtQ_Byoh&wBc8M3UID z=hiNK=VyWQnmDt0ke&pqY$fm{)2wK$*DrWS4-?m3`{sT79^SjRvTxrJ`}a5d_G#X* z$Iuy|m%PQ9ayHOLZsRNw$4FF{C95YEmIlib>N{4TdO>H6%_``vi)gQQ6$b|f0osb8 zWm#75%my#z7omJ_+3sy!!)jmolHe?uM|u5-Gw(c&n7em^@mQV101ee7G$svz#|tf_^#{22L6%%iIKs4N2p3d@ zTTqDPWUY+M5_Ct$JNN8{pmw`U4UC2@A`=7Ol-mlOY4V#fJgUORfSDhcZXt)vNkA8U znw#|VW4Y#3GbA(cJWM`Pgx1JkL8us)s@PDwchlPu}2}S;wJ0ZiK-!=JFQH! zC$4--I~)vA_44IUx_DZ3;YJ8CY6v{!#kiU=5TkqL$Q1yZ;zU_3Pw%$* z%|E#4KS=@ywMlecins=$1@W@}6Ag%Hnq?UohkOUUZnPAnja-+=wGd_qM=zWJ!aY&f zQo8wWb`=p#Bx1P33xz3sznxdJMPp{SGssEO>nh-nMIPK47@thCFhe+~+Yt zDrxf~maYN>J6gmcqck!U@@~U6zSRR#0vJMYWq{fjgfwn#&N~3ux_yBb^?0{W+Qqc>}czP zlz0)Joka6e(sWY9xpB>~{QHm{j-v+kKdo{A=Zuc+vC$a)?&RQTkmSep&V0^%&HS13 zJgaTlZI&lq8OIq9qymWHF^^esw+~1r3BNAuyxS~nW9t&r zMb6obc69`Ppaz2Yp%Y3)7GqXfHopWRcSP|h;o>r3D_Wl)^Jlw&gww7G!wl7qZBJee z53&@QknL#yNyx^=Vpg!6Q~FviYs6(^DH|$1W2xHNes?x2xA^EZhn?WXoCSu8YA2-` z>LO8;Fo(kFi|}LveIb)7Rco1~IL}9toNbcH&dkrVc|o5;n&(qm2w zPnwdteno8#|R8{(6_y)^C0K6z1n< zvi2MXVE#y9Zf+)%EwKAns1lCC5>qMfsUEb(X5u8ku!~On4mO0Cu~$qAY^woIVym zuoSX@wK&mM%Qhh@y2zN*;}@re6cSGvj$2Z0p#~%=mD@ur^_9AO-{bRU_BqG#IKGCH zfmlW+wj(nrHZ5awxz`lN7-^%$u+q2`28*RC;i zr5%c_-2?Em?TgoDX4Wol$JfO}``FraXfeJ{A6%-k-Dx_$Hdf|KrTLXcd^LvHS#K~g`4yF62igx*ISHCT zG$$s36Og0FCczV!k50lTI7cT03k@d;=+Y{ne9d=T*evjZ78^sv!<_(f@8%ob@@T$a zF9R&%a25dF-mp_rU(sJrVDmqW&A;GmI#pZBsvSKxS&=GyV6rCFIH9*M z;RE_!=Oa+Mh#6vx*92n%?+k*7!iO_=Q9COuoNsyXAt@sp3lbb4=`GM7lP*DbD? zQzKJ}xsxiSB@l0qluSXj2PdhHGDs)Qy=v?x0W^lp-rOXB1Q^BbuG{2Ef&T@|$oM%K zPuJU3{lhT;_U86@YM&G>`_6UH@&nNF3achBWwqp;&ig}81qWlC7s+18e71*sOb6lU zT9Px%drg3cH6zR;YU9*yG@cSnqX*A1q%oXx=4Q2Za`*6^6l9|d z5B({Daq^@fDhZHNrvwvcXL8`KdCWY_xjN5qz6+1zr`fsleT?8|I5g+U?(c_VCj*wb zCWDmeA)6VjN-fl>C+B@BHSzo}$5kHC$^`6eLuM_LmwK^QQ6-lZZ)}4b*#+lrvHQ+$ zikk$%#{1Al_!pO^0>b*Sk8S(o*LKY|47LnAb3pza^~Q#Q5;CBsC;m1?eUV_KmZ*AB zk+jjCJZ79qIa%XcL#)d+pw20nb>gqxGxsRSh$t~}sb~Y)?v&A^ zyVG{3+>wyME2IaonI>|6sPB)cRdt14Vo zjkI*joM}TMQx{g`n5J3(Gi-t;%qZSuWZ#RABidOtr!-X%M))O8t>KIm7Mh5;N+z;d zIVyLij2_*cwmapXOr=~3g3$XKSnFVS%Kt)%XEhMd0#*WkT6<)d7Rtz4^jnMwK~an( z>rkoDE&SjTp}Q%9#jyM^ILM0Ln*u$y0&PYF@!(~@)om1WhL_mZtWDrHA2DE5LKmg( zaPR{}A`hUj0K$aRNM~bHmJW)^=To0aCrO*wrZmhWOpbo)=lbYWsN)^+ZPdm=t7X&)0x2s;#CD?QB`LNmeHX# zQt~Jw+$k?#`(O*}wLYR4I{;DaD}D$t9=JlgXV3K$g^B1GB8)wI5)m1cOB4&1Y138` zB9e3K&rfH&Y3c$gC-Cu~kIKe$cY-d^Gti;_tG7&>G=aqdyWUgagW&@?jpar*%a08- zhMEj7lL6V%;Y?9ctMgkrz)ljbLUlSqw9qGfhCjBiDgknJI)F5Den5=&RoD%z97bvn zniL)4?BnQ>JSPS)F91lnghN}1cw@n>9&l11dg-1skKsvv1ey2?&Zo?CA4diT95^zT zF%u%_IEPhCya}^Rik~p1C>B4V;G2{_(K%ZYm!6ObaOZX}k}sB}yV|>MLz|u$$G1u{ zlJ5K*-^tc05W8c4IA;pZNJym})(F*L*%C)c z{&u|W1khCHjErFPcZB$ar%BnFA$p3YkY%RfC^K}g%rzU;bUH8YlTW9sjV9q0J5x?U zKQxF12_Wz`9pN7RAj?pUF+1%BQ87eIGh`MaSdOozMPf(^KdH^drjjlfIb;ecp-F3L zU5sADH^C2+=HUzAYmC9q+Kz*b7$bUykZnIh8Dw*W^bK4hZF+8fIr1t2u)I3qL8<^@ zPuhaMVcU!t83=^I_oS%+xeN0#eShf!I2&W}vljQ35i5jUpfL-hXm&Wd21Y(=2@Wfw z*}|*H295?o1lv3Lr-~e$#sa8L%t+=zqF^EyN2(+xm3X8}63>={$@dc45RTJjt@AW7 zfNShleIEN&->L|}g)lJ5E_O<*Uk=wgW4j>K?sas6wF|!~+03J{88x|UZFC}5%D4Bo zeY5kOj4jIesuP;5ArfCt$8X~6t{kW0H}Q2>4&i(I{946aKIr_u^Jj28t28S1-tryd zEIXd|2pvZUMRP~P>_j%egu-l3jv%%uQXb(-k%nx~w}@EV_Eto3M0=t}xN#}gPEk`8 z@yj`kIxr%(;q932c55Y*{hO~KqM-BSn+KD(iQbJT+NN{j#_slA=zmqHfw;Y77C)hl ztJwxwTbZM2h>8~~gt$ZPi)gB&H%V@Au#Y5;;)5iSm<{@);z;6K<-op}D?Hu-Fr1(I z3Z;yB zVWw2fia+|v525SjQNA>sLUVXEk2i){9fp>!*4cS6$P!UajCOYP2U&da=~N!g@OOEi z9{oYOf?5=ZOa$oKX*1wOa`Z*D_V&0rd-Htsb7H;2LxbcQKM28z;cB!|z&%fMx8!8- zxBL_Sme78`k6ry=#cICNyn^#h|A+Z|cbcHwJ6)Y$9x5Z}w&ShUIkw0rEo??CspaST zc!!}~lGe#QI={~zOpmd?MJ@*Ryj4tY9cJJyMMPc%7{U`NyK{phQ7dut)NsKL$Y~0> zokx+sxC)#D0|lXOQ^H!5 z;+dbYvnj5}&aT}lqx-G0q5xNzPpsHm^~KIaG&WQrvuOEu$j0ogg;?zakKn#1WRaepTH&oi?XK>EpTlK z8ksOr3Z@KO=e zR!Z{3N-d2@ic;vT;fzw`Rx-aK%RQtY_EK7phIMkJ@$`&o?6M2c&zQy*1hu8susz|J zXRBme;qIDO=`o}od|i--D1iR(;9L3bw)dwaHXxNDg|DSbBKjEPI<^@hA+OiGrYhqC<-mFYyhtP)?5k%s?z@1Xghd58Xwsui~QggaCf=73hx3iqTg zvU8r;BwWOb97Jzb2u8k42fe?20S|6u$7>QuFteWS&_q}%NNIUyQRZpz2 z0JC+PyC>RtKhQ+U57?^!2N(Cz-pR1NYICyBYRYbzQ#6IJf>w6lf3P{)yT*B=dC;6t z|0eOeP9IyVZJi+y29eOet>LpDuLEzq5I`26*EpwX@8S@jljCa-LeTl7VQ>iQ0~@B^ z_jnDOi!azBN?5dJKg(XBSMIW#!li;q(+L$xadho!z}XNjPDfHG3*%tVLgGxm5JK5S z8#)N0&q{{k?R5UT_Ej@5#Pjd8dD4~HN@X80oyl!$Co#3Qf3;kiAs~0}CEv3CjAvZO z8Wohl=I&>ToGq(_;XUIzJ;2HMaj$)bs2fhf)7f^(%*NXOYGuBbF_XqghV75#y$3Fu zvZl(_Pru$aAd0;H>DGi0i5m0t>%*(1)%XqVO#B~mvOTZcg}-yyogi*v)-HG)JbT>q zwrBOZ@DrMc6Sx^$hqu2jf)i+-rLGG>E`h*&G|6^g!J2842pF4b{qNfD`%O`AU$5l@ zs&lPh<7`^t|IZ9w1<-&W{a#1#+271n!npSUx#`d(?_Zr6U79% zh$=dz@-+KR&o+)ve=LxW2C+2vo8fr@P4}V z2471`_ED5GiM$9^(Y(nDQ)f*gi>}VWXzrXflfIgm#Lu}9Xn7rIa-9EjI{mTd7mt0_ z$!Y_w<9z(**FG0t&zw2)IsVs+M|sx&gc^P*qyJA;0-5*!?50)AS)ak=lU}Om6Zqb# z8p(IZj=VQbJlD9tdE#01F7bV4lm=6kVij)qyPQ7vtHJ)@W2rA>pOgDo{&?}K>h1Mh7 z{O^m;{T~(EcTd0K+UWl{KKuVS4hvq%|8V>=`@bCDic{!C&I_F-w$i?a-={b);D0@S S8eje2$9$|)V<)P%pZ`CQcAmNb literal 0 HcmV?d00001 diff --git a/public/OFN.svg b/public/OFN.svg new file mode 100755 index 0000000000..36340b067d --- /dev/null +++ b/public/OFN.svg @@ -0,0 +1,59 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/OFN.ttf b/public/OFN.ttf new file mode 100755 index 0000000000000000000000000000000000000000..679180d708bad13a9a892cf44656d6489e6375f0 GIT binary patch literal 30984 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%0DwBW zZbN#O{R{o;Qi2D>5^N0=ttF>ER9s-WlP^t58*8It;Zo~Zd-|B!>JMz-msGLiRt-i~ zMZ04Cp(#z!Dr%a%@)h6)*c^nargi7jmYj2HiX3Q<=M*&5{N zqdSeod9x_57Mmek6|w}XLg8avi{9B|&T%-LQqN z{i~k{xo1~5#;&c`bB{)-Ik}{2EGjgQq>S*@9cg>Wv}EBHZ(?{%t+Z4+S-SS*i4!Mf zvu5=(F<0L2JV3dhqiO6_90;m40EhxKbhyl0Nlfi0D>v(oz2m97DW_y7dIOjIhMc9m-?JPbwnbklk zOjv$`loLd}kiX1M>~M`S202_dl#oT6`r--^ z1OQXFR{ESlmi{}~z%xW>V#g2~l*WA1Y_Ruwwj{Pq+;)bJnF6^)+SC9W2np8CV$D=r ztq7UV<)!Y@&5$pd6^hL)+O9avVe?PS8QkRX9m^o1S;55%xs9r}til3g=R#Zw)o>dE zsa*Dvl>Rt_+76kD?J#-ei&Ga=?f7HwRS&)6efUO5B2CY{!3>Ky0yXWb#Fnt_htNb~ZJN(9$<=4k!CXb=5ogZN_hRoJvEBID9-A_?P*fQYf!uoh7&4RC0 z2pF2y$YO>T;yo;*u6nKwSlUhygxHB965Z&IJ}jLoJt-s})vlCDo=P~AsD=D7II1tk zARbi9d1DZ^SUeT-?Jy{xeHgciY819P&R{De6U{<5VvVA)o|08KH<3|2*GM7@b&W=o zMEl1(ijb^#QIdTTqE0XQ=!IU3H`^XjzrYRO@{$J)Yn-wd9(}5G@{~*_g5Pk*=5XbL za__1TAwr6aKhf4g!LT2QB(1%=V(Dq8hAr{8=8v48a_)CN>HHnjfkg>(g?SM?9gc|3 zAWqa`MFAI+!eN5$R(}=N>MOvp(Ilis5%(KgVwYlKme+^V9-`>+!?0BZxoXX{13w+f#XkS=c1wj;_qj zF3j4H_R7*+69$^)^8zqLgjYEC$*F=OHEw|EjLKS`p!h7&iYA{X7P`olrhVkvgKJkG zTQ+9-*wt$XuRYSX^o0LyYIeCy_PkomD5bmv&PK!E?M34xb=CIsP)I~F-u4H z&loea|L9Wd@IeJ29X#A3oQKK8j0geWf;2a;)qR?7t6?4Sl7vR<&(MN!nNRh`Y z=1noL*I?6r(o>D;>_We{w=5w*umtN40Z|sVIveR2BmxD<+B%4lz1b|WbZOA+|0 zY`}$=DDUm{7qZh0VzunYeUb3q1VYloslLdT zws7iFxGHOD-b75GPVqzDK+A%MO;-z;Vhg>XH&*L8y?T@U0y^lKTE4U}JC#kl^;Ef9%T}^;2N%kvg#&Z> z*?gt7FqbpF+XTgpsTtzaXAUfsN(=jEaAK@drPI}%Gy+>R#kAjhFoLP=Bm82i^~-z zmb+$`%`(NzFoV_aXG=NrsUa3}wwTG7c|VsF(4B^S-?1lZONVW_V zY-{t(?|X!-`>7mpOIQBtH7xeC)|F=rpgApeRj?V}kDuxy_D%k%^LFPU=dW0?V!%7n z&!LGXOn0*_rBp1|Qi)>GY|>eIs%=QpzAw0qMbjpTE?OQJ#f}Ru8c538>mA7*wZh6` z!L|0f+*vGT*n8^@JBk!>G0zcXMIu?y?Y9t03uZBLNhNm!W?tZ-U1?CojmNi%%Xw5P zDvvm4bn9L^k!7ObH?F@(+yb5;`%sItQ?HpOuuD%QifJ7Dj&vcfdWg66mx2uD>;Ww$ znx%kU9;9o(!$B@AR*ydIu^<50Z(h8V2<#v^dPHPDja=mC1MmMF&e|j^zKJQq-@I!h)fL=cewhs( z15(eumY}i3)SvDK)?x3ia~S%&i-?o7v*Zk&W6tB8%bo9Zp5old9^Mx~k#8m@<9D1- zYVWR**|@Bqs^w&&BZi+qe&|wmlI%?z)-Nk*-c*&@@?jZ~otZs2SCfYE(I-90vX~;< z;^2ogWwR1afe4lQqaV#DnqA6MWpnMBDyJw;!4}midJ1zZYgnX!+@@(8WbT@~zQ$+t zZz{K-Red+Q@%nKy3*#Gen5-W(SLPkh7Zsp+8cdKdQ0?)zJ-7a)>T_6sy@@sR!Oe7&#GE) zEHZQjYzwGG8uOs|dqvY)rxZg2dn8*-5xVmw`&o4#a%$y87Rahy#5@UWe{zp%ytIFgOY*hmLxLJ zJX|t)yKhEpM`{9_LjYs;*wR~hc5vyc<4mL{GNpt9$-D90RTCMuOHt)-nb9S@d-dpb74wYIyUa7L zx~j6eN{h_QzlkU7W52n$QUO0tLFfKubnY9Rd!6?O@`pC#$0Lb|buD6vE-61SQ$b#@LR2 z&zRxp_l<(Txj$@luP1vQ+V^KYeH@V_w(PmJ3*Y%!;Cy17**ri`f>pK>c#>&WG}h}E zyrYMStFM03zI_kw-CNnW?}+{T>wWt)Z`fn#4A4t{*qL%R&_-UsSt5>+s4h!ZPb@4A zmL=48tU&dG&KjFl&|4SLUhOIl4h#ac6+_FitlpUoUdk^*`QEbK+q#A|1<&V=)Lp-b z1ARaG|EF2nVD%#7k8X(X%zH;Sq)SrGN@?@n`0mqRwIimP<$m#tx(L_CeD%v3k@t;X z#6@VJ`{Jf_a$N4>|MBlZd%{D;ST}ISkNH zO+sVR0C>F6LRx=-Yae9E)r2EVdxmg9MYsipNKV$u$Sgs3bi8xVZU}0(yVSsF*dj79 z@J+d`(3vK`8N;J0Yz&zB8R-^s$eaXp(WkjlKX1u3rr{L+hO+I-4Nuzf7A ztgfz94y^U2-@+b+u!fb9MmS!bt&Q+gciih`cE_H!L^OKRge+juJAv0q7$$u7YVk$pfC?1;_KexhjMyNGFLIUhSI zIX;Na1sFbo*C(I4Ldm{WS&0zw$Y4xUbLk>m_%YP3%tT0k3pHDN<*AL%e7QW|X~fs+ z@^qmvjgA&wmmUkwwcMjk!{0WXf9pdUcvIp@~ z0h}{Bw#P(wL zCOb1f&*lYv4r!iGX(51}j*_pc#P`_m8k8$_yesUa`Uq0w;K16Q{2A5dRH0os5t_QNx5PU}UrEK18(pzJjqMTzerFHXa zdDq-~EC^x{_lQ@y4Z$;!C}$qt3w#Tsf8&jNdYu2X0OI4CyYcv``gu&|ElmsQ?rZFF(XgH#WX z(5|yowbsb217yPE2nVp+#T8`{MCbIe_<^O61+2x1wpz9cQPD-loF2b8Eu@fm%5dD0 zatk#eNvYf(TB)zp<@+9=H?z+qv;oD}piPA}UjDa(?x60Z{K64T|KId;p^aGHcG zAdx;AE`l&mJJctIW30zW%?ULpgt~T(p)2iBWbGb+Uu<8zHZ!w!aXY>)9@@v&rbCPI zb^72^mF-T`@wKrsUnJt=I`bIW>ziOH|13_H+%pvp%u%(nZV=W4tC96L@D3L=--ZQ8F)e zSf*F#c@IlzPAKluI^c;-iqMC76;762j`_GbAvrX{WJ+6){iJpFkaoo?l2Kc`StiS5 z%4~k+VM&SXPJ^F@YMmUr%KVABjg|U?%BJkbiSJ5#Z&vFXxVqJg_iG!mRDFc zc`>UcZ*|@qdMY>=U>ZGejvoi{RqpX1P+C%C^Kj-3ox=9&yrriW~1uqw4sr=FbmrPRdpzZ_S2Kr0il zvkjTGOkV26T1AyyR=lwdZe$mnyT$H1yD4rG1RL)|8{uDEnhFT($3C|0k6+t0+c4NN z?92iAbJQCf21>|)nx6RE6!k@dky@haMMcs^d-AlM|7{r5WQFQE$~Nt3Z`Q%X9zIs3 zZ49Wu63`PZh0WM?k_GRm4Ce^mIM5SN_&aQpag9_O4^#NgE_4@^9R1NuUFT$tYYnk3 z*MK^wVAhGhcF)|cAS0s0#HFGQWV=&F5AROfopN`o#F+xxc%=+}(jI63~RW;JmEpw&~iA-Hskz<->{m-!pnlPhylaYNd zK8|Q-)tu5)K^WmzIJJf|Qdnpr<|>)UX62~dnKF8KciQfhyEBz?DF{OEYhbN|-6{VI zC7#tlJPTL}_-XBtU0Nt3Yte5pA_PS-lB`3eMmO_=ON8#G2o}Tg!{8t*dT$E!*b1~6 z5yXR+{Z_Y8%o$!{TeCKS+kC`;Q3+j?y2HT_5Q#j1!U6~rP9vR-O<6i9CZA7zE|tgE zPheY!SNq;(wZlhg=#9l%bN>ZMZZ~;dAcbuQ=Owr?2|muGO0!iPjUc;2aj|YvM=NXO z`PjaQ2t*fx+@8)1J`k@eAd9LxOR$U%t&x&P5#dgG`Pv6tSg-XF#n=IeVqft?fbqZ; z+C6)&pD0X3#}Hxc*^`LKpj@I@uuPk_k`R%`xd5H*rl||0oWRF_J}Mj2-3hut&p?Oz zuii3k(gYRXEq`2jK7S7A4>au}&SXi{{DvyY=k@|+mJyZ|8O5)N%4;*ABjdcaA6 z=%stkJc1|rA!On&IiE4ld=wcNaNx*T#!QHy;~Z8o@g~eNDSpD3qFDTdf^Sm#MCWWp zTzWz#z@6K@NWNH>?rQJ44Q+aC9N#L*NV@ZLd?#D0lv6=Yh~lK2az!V_?M!)@9TV9_ zVu&1kLF|tG;hZTrBO#S`SR+(}WlJ0(`P=cf6F^g)GctnF-x1;yo+f2yhUh7pLYA3^ zqs-8~EZ1yQ)9JjpPd=TlHkyQ2>`XZY{m>v5B!Ix%bcB2KgDgWa#_Y5kM8yy-&5&7y zU^%{;7KtGx{G>J)n@YM|C4wCTC^<;bf9!1C&Z2dM&tJ!uR2hHW!qWFQa*-;<^S28VjI0F(a7=iGqn- z9I29&RN|2?NjzH)Cf`eFLpV;Cwa(MT0IsoH^;zs!{Sid~E`)(ecCk}h{c^b08QTS+ zcCVuotX=qR$z~po&8W#;YoimfQog;v?c1I2WNcB!SDnyg4UzbII(`#hcjY)0zlpEA zatPns=hrIc@&V`foj-%)S*202_m=MvXW8+zN9Z^@D4IJOW+$=%CKP6Sas;tOk@5&v ziZo<l9lnz$BI%< z1)K%l>Qz=jRhng7dP|=)JvBe^WHLQD566cMh~tS-QCg5HLnJyaleANiio?peLGhIm zD+VW~RCw~_88#EA{@BK)IJ?kM`pnnOKbt>rR`Fszn_2rNh>LSpG!yY3vXD^4e34A7 zD$W2J@-{bl!GGS{ z3qx%(NLc1PlwyUn4(+q6Q4o;$0>%V7!jIdNH!v+=1|&tNRiYM)N$`Vg#sFIs!?64$ zyv7eo;(l~5`knUFiL1alFi;TcHYKb@DW3URJDcKq?Cjc|GP=(yD++Lh`NWF7RbT8( zL}No0GK-dfhiuH=T8Py?@Cfd^Lsm)q^g|pBJYdtSRXef40P(lPn1@!XG*HEz>xe=u zQYr{fF3ko%K0eS>-d>h>G`G_kA_p`NNzwn+V-{%+^DnO4TF5kK!Ld-PxzWAWMT?%G zlG2znN!fSkXWJ>h`B`iduqb;9(E`_&ppgj^rC`dih5kMbFTRIxFi{4h;T;dShSw}= zWMJxc9I(TpkwHe-+EsDj-3<}gA*YFG$WhE_bxanhYUUxxNSmIl>ZX=0Vc8VdoziC$&X~A#UT?@N#-wEV ziMYo&MMnXA*7*o4Un$O~C8%))8Sp5|ox}DHofnvjukrFkeErDeOJzC{FRR2?WTbJf zb`F{knxEAFQMJMrpKyn&!W_^_TH&75MRv{;n}my4(F67pW;DO@u6K)GMcVFt_o=HQ zKlAQ)>DNBK^PTpk9*^An-tqmr-#yOp-h0R8-tmrcZ5FnBfbChp)&fw@$+aq75Ac(Pt$?@pd}@UHhsT7~=VN+C1sXY^Ab~ zn9k(3wUd}y+rL^a%@B~g_mZcrKl#bmvPK0Zu(|swB4^7gVR%ozRu6D8e%z~{Eb4|+ z@N~9aGPAL^zgn5EWz3{;l41K}dGCRXrmU%Q)iu}I21Jq9U1LoMk*G1(To+y~t;TO? zXX5{mlkIu!F8rOt?gViYvv$Gb;MwD*w>_)Rg`dzooWRZ4I=t;Q5u8BtRCQelatQ?H zqe->{3)W1VM8Mcg>woWd-*1e1`&um@P@QZ28fViA|9@s^V{26lL-;H+8!z63r9GVN zFk578Fs8g7(fr-s`8w3wm_Aa~m?$R5MO4u#m8aQndbV+V`g;(PXh`(`1)sO_5{dEo z+rys3oaA+Wh>w}xdPEG9CTm0tYt7#ECnCF*n}7U%TZfQ&yG+VZrrj2^E%R#PbtmXR zu>ku2bFAwi#EsqUtIz;BH|2%cMvn{*%n5cKPjK}nNMP+T-VPjwf+-OL(>jSJF;w1v z(Z+N*p(bY04lLQJG)CI1KL29S1n;Lyuk*E}WFJL2lgNuu70sKhFm=`>vgqm@jONZ+ zGwJJzN&K7(ftJ^SCdc_dr_-N!cJbKPovb#{I?gBGxAukjdgjcTFYv!!Jj}EHC)Dsm z8U25%63D#&XE&`{&iV`{pY&2iAH(+!)kwbEcjUcs;52e0NVm^YixBv#>uzsu=! zzZUEdK9Txz_8GZP?td&S1jZeG9j-mNbU`@`FZ_YFUPsCMXq!}||^PPp)cG5;zHiHk~5}rAQlaz2) z={~G8Ob_b}@54I7`>@XN-lyzJR8LsvHN+^zhDhIf$&7U)8{-Q58B7e%%wxkDq`2 zH>XI_oR{$Y7T(2~hkvnZ!>vt{GAujc(TH$0=QyS160MQ|_1_mAJU=GN7CrsICP zzXy9eZ^J`8dj$7q@qYZ<$9?R!4K3|>_OH0-c3xUFL4Ie$t?hvKoqf3fh`(R3K-zfg zhBbKhh$Kx=c-Okm|Ienz<`#_U$0&2UzaNh`(!`0ra$UkWQ37 zDov6;A^pAddFf2)Z0YOLWDIMjG)uZdx>A}iEs}1MmP@Oo+oTQBW~oi;lA=;lA}K8u zq^i^>ZI!l5cT4w4`=p1Y$E2sEXQbz)m!(&w*QI}x{+IL)(Eh)r|1;ru^cjC!&fhY5 z%arrCTrvH8|1g=arto1ZAExo)0zORV!-ahK79TF+!)1KFuW-YZwkYk!tkaryeSNC>iLp%+yq0KDqU~{^Cw9koACH? z=S+M=-t!UdBkl=LiPa~5@}%#6?953|oO0XWJ@LtuDpcJNa}j zoe>*6p)4mk6(}|JbY{}IRL)6O^&Yb(dUh)NiMGoDE0hU3T8P4CK*SzY;!Zr1NOyLI zHyQ!44{g@$TDmISZwx5$Of(&J(rP;H#L{*;<=7(OeO1Y6IW?2)=`M|?Y66X!0X>lH z66AhDNeAqJ<%2P5;n9w6H5pgqx`@qGmJ)4{Yi3!kXik|*R!xL2R0>WZozEogWGZQE zv1B}{ipB1j;+;X>3Em0B=QCVfxn~gno#39}pU=RP6Yx^d;nS2Ebmbv>fnIp#&`;dyDMdj33VD*d*}Yu(*?|iW$alG`j=f9nY2IUKb_Ed$?_!d1u@{&0?=tPh1ql}q zae?Q8zKLd3_bZBFj&Ed+|H$H>pnYMYB{J!jZkd*mGHpsx%CfDLmBJ=SEfGBtCToTK zy?qJ@#5Bk-4Zst$6;&_BYe%-s6sn>kcAHQ+m9j0H96>u}N}G<6GHl(_(4plDS0}(> zNG6fxcL;3@+9g})694&q12i)6!XyL8lsCG^DL@^+wJaZpcgrZk1-J-caqmn9hw`^! zF_6KpxQ>`{y;32XTPAuI=i*9|f9eh#JI+VEOBB=vo{n@0Sn@jwJaKmf?FZbef<#%_ zFmwaEX_z|c=mTR0XazDJk(UG&0+~CuZKtgarGXqq%3kBqc4) z)*Zv4w4l3)x?!KoNM@N8JHx6SPL2w?|2mX6U-6n|`}ZXxB>GIydI`DTVIYmO~jqHs;unNyDu9 z$i?iBd!H%+geH`k#13WvD2+7}Yfq5RECrpkCs!Y546n(gDpp9Cs zP@CQ4H1%%jH~Y-WfVK_%Xu+{h&aH<(p{$^_Jv2h2ca7{N;0wE&(Q=fdjFq+>%mQX& z9W`&GowVc5;awzNp^ngIlDiZ6b^^Yl!B8|D)sqybL?x6>_6M^;YN3sdjW+>(7r7r( z8i*R2iFV+;bqCHvxW{?3?491IsHudNpbga6PFtvDplt_zkE%U1gmK%Zt(U`@KuJt; z^J6W?J}knpz(Z3J8+^B5=dDa`JJwpPoT$(q8re+`(LL*TEum|vVFkvvCEwPQ5Vi@F z^Wx25$BmInG9HR_=ho4C=x*w5rAAuYiIIdTTC~f;>CSdji3-Vln1U1uQac1f9BhPw z^NpwxH6vDRdEfed^awqF=!q9dyg-Mpqbq3k!iBTxZynMh?{-CBvx><3^b#WX(@jM8 z3=?gW(ZQZvF<&g@`atQGBv@BswM-PTqlBMM5paO}31ss}cPAuW(p*Dyi@fM;Wh?dd z(N-$x`D8X$3T3;fi$aNbSWW0LRNdUywiR5*ee~Gz4*uGy(3vtdZQ0U<1vQ!EM%pq! z!vHfyrs08s5s(C)4%5IEY7%s#eBCC6RyQ=PrqxUn_fkHUw{rqr1e8!QQmL0OQ?W>8 zL4R07vK>#wDE7DF?{e=wU~F9Nc2;g`s39$U?vWM4z2{&BItta2^hBAub36_I1{p6?5U1|Mn+m_iJ&P!_TNOW zzx5ix+nM9h6*ta2hc;4UzNPAz4i@898qD`pTBxn6_JeJJ8-nv$jwPDY9sRUTU=&$B zr{^h{kJT^;ATXWVw*H>hy@p@kq0zyiQ4F$@C`3zk(J5qv7LG?EYSF^da1zm2G@1Z9 zANx0D|7(x@fgY!y%=_UCnnCmC;c)#UXYRk~hS<6mYNB;dHvO1>OivEeE*f4pctc)z zSGbx&FFyI?i}WHrxqvRGTW`PUO7D0P3z&usMy?yW07F-`1Q;{;pv(u;5XoGkWZ3+Z z!Qml_FpfySe3g6LZ9k>&3HMXpua!BpbddU~y1nn=OiD}X*dY-t0~!gg!4e^(__+m{ zXhAFregN{%g>q${9$(bq1w^W4ryLf4xOQv@@&h8;0;^6rDd%BzJLXqV>(Z7vBwloX ztptUWqS2Ut(cEj*-ozdCWXU@Ho)x^B@B%>SJIl*rH5(((0+R$fCB}XG4<4Hy?*6JYGH2DIM^~m!!$Sus06#In<^FRq3&R%)318}SCq%;f#q~PwW)29fKa1Y z3CXY#g1io=Lg}#3j8d2E<1$Q*EiDjD)K*FK3s!|MaX({GtRibLpp2a0#U*P+lTq{d zzI~7TtzSut7t@s#N`;+pDhjhJCdhoo|YXf zN!Gc?J}E=spqlVr?@-)ni|FtP-n7SP>;&1Hwn%Z$dYm7ebv-{AYw?~{>euz>kb&)E zCn;wVZK6x$oz`w^7f8EAMH8Iu_TR`fUD-$t=0+Gp->1UA(BK?d!y?9lbw|%sobFUl zYJh?m2^|pL{g*qa)1KXdW_!RGI|y?-5(zb z-6L#_P!5zL1C3ZlpN9r;7VxA4QzB&QA=wCP`rVJuD#ZquxYMsGLdL`Ba4*3ucNqta#@_ zk+}ImIz;=n-@B&*%tCs@M1YZiGfaU)^uRJu?ZTUvEhI7aF?X$Ev>WYuM|@4*x z`kSG6Hf-Ls9+GC$Hi({WJ%dBp>-2?m9R}*pHW-?zTRd50C%(UU??RvjhL9PjxRKDg zh>0a-WmDChRdg7E?iYc9cOYJ&075tKT~uA0>97+yEk*mxyST;>hS*P#n>J;cN}2AA zWmwH@GtxG5(A;Krn~r97imBe$73!>nYFL!zG7hy67G;1JYXCw*p}4BTI-o>`U|3`` zS)6{${{+?Fuc6W3D})zcVldGaC2p2z5#qCpm%A*`wr|l1S0&V_f3Vm@E~YDwtVj* z)}@V@?ptD3e{m?Y70Bt;dg8ebr=40w*lSlh;_X^17=4!=bRM(z?xV-3U_iZwl*U$U z%{0?yYSr4~9m0F~35BY5)u~vE_N_oUDnRkYa>lPU(yXE!wL2ZTc#qag{i5WyD?Pbh z2ig!-^@_I0T(O+cr&QFAv2AIZk$!aubJ_3o=6ZzN=Pgud*_t&=v7W%at-kJRUva1} z-&3m8EZD|SVm<4Z3O#twJ^Ov5FKxDUcC|&C+hQHzU;v5&Th4B3rQ*|r_8;t@+S29?46R@R-U(qP(g>1ZQuVK_&u z2!)0B1rT5@RZUlT8QUOYtbCY7sjwYQgtd^-#RLsKplCw)ig$D+77oWkiEutvN|f`Z zQofum#q!~7NJQ^bU=&jZP`FJqX2kV)5`r_472UHGKn3iW6;H)&DB;;`)?#0TDi&A@ zt5jfBe&bd?m9ul{ST>$bh`8TsyDP!V+wO1(JZGBxs zk$hXJqZUk>8j!Y(*4#rrky@b0>VBoOudUi#jP-?k0u?rd()1wRvxa<9H`lPjwsp9gykOD<0Xcw=az&rPIZWntgp-&4VC2#0&>TBO= zfUwwnVwa?Exr6ed5paD|?`&*r-_)+b8K&t>mIjGyUR1ib^mh$)q89v^1GWB2wU_NC z+1>2@;TTZkO><`}NAOaU$;ShbeqjP7;J;4_ zJL%|HZF(Ba2JFUy5e!2Z2mGKHWGwdh<;<*+H8XlfPm91*izT(!iQxN`)kE(Pbx4!Va)R@ zox~QRb8AF9vrP7&Io3V^3_H{%-kDLth-JoudLp_`fy)=JSm?X7Gws)c^#(mxW3+&y z>Eb|}vXiK`9tHS}SjV~h{d@UW1P<8vYMbAv`2&kauj(awy9>^;|DO|lc!qn90v^gJ z^kV^8!ptQ_p(JD4!Fmyq@dXPoSfBPJCY~o<9iMi1R8y+0^0aG?#!NP2q@l&}v;&RI zo?}Hg+mE>0b*Kq2YU?)k_{7$y)t_3{WHGPe`JGAty7RzV6Vt74o1hQq3A(|ZL6>|& z25SQS`sS5j6!Pleokbg*6?lbWyp&Lld++1AUOpvaVXzh(F+#)%u{1Fhwhij*2eZ#K z?^8W5HU}hF2|rm1&5}z?Z~r*H^XA zh`@VH4eYTM>~Z%ldTQTWa>&nH0|MwSGO;w%)ttd%u$BjFwD zPTEO3G9x83ZY7*VHVl0UL=PVtw6RPsRSqrRrTB-9Sq>ZWP`f&naJ{i)Yf; z=$uz({s;XBz49vkivHu`SHA{>%KJBED$Rb8-k>*Mc=1holU}%-rqZ<8mro^;cP~`P zl@O1DWMP73BLPIh@l8;jc;rSn#CU?BY+{C>on$my-1IQ){L!(s3N0#|^8LwOU89>s zESfS~H_ENuo63z@(UB(a_@XYq)bYS(x|*)OWz}VInBBA(-m`-tOJ0&*SzA9MEK9|* zC2R0*7~QtKZS!3nyHrurfrN-H&+c9^NI#&*_I>ZUtSDLZ=rGAm9?X+J1`PQQt*wns zNztRq!`?il+m`p_s@q`0-nF*anGx+7@`Rio`?9i@wX^!@ZkA`pmwlHO(2O6p zd_Tw`-__ameOm^JH|VsiAG0TiUCln%!4k&(9dIiz=K#ug%f!W9ZRXX1Q*?(!1DccN5g{B;-=i~ z%5+-sysQ?YnFupVtbnd~vOV7=wyuUoxb0p!S55YIZpN!|aEt zFQ{2Y*rTmi6Fa=wvenYlF#y01lMGit4-JYP?rgcwMwAvVydjweI(p$5SnlnDl_FC( z8fBj;N&|8MhTR7D^06<|2JhSQ58aIl!NkM+!`~)3Ofhg0A4D-1-+u zO(>=6NwNG2cNwjCPS!J4CIgizYuc)KXy)4_!&@8W5L>hC{kwPDv0!G>*zseZMbwo% z9jOMcE_*vjf#T!ohzH}g;8m0`MdJj5+#pl1kYKl2AxjnHoyb&)=Fso_VujTAorVZD z<4uOWv%c3Bv%W!g7r8%F)-&9l^=2ON-ca`8@{Q$q_=Y@ozWc_}?Rq;&frHJ{`~BkX z4sS%EV6{xwA$=^zK%u9D`7S1{5T1AR(RLkqx_hA za|!oLww6I(!=f`qbvryu4YHolS^e!QfYAd*Irfmoa#0fcdPQa13fv!Dc^oN}V1$XC z_i#SKc((_~yNy-yi?EWm(QJ-j?ZaivQ{Z>j%0N$M7&_~ex`sGCB2M8H$&lBqXJR7o zf)KCBiXf77x{4~ImHw1b9)Xq=Bx2hAJ+vh?!!-Fz3hYAIi=$s~J#bJ94rqfzU^2%t z;FUz|2Yen@7Fyyf{KPyqGP;8Bs&`boU|&2yJ*(t&2oQ12{!I2AiCl+lNAmFk_>|#> zh*EOF&gGn@Fz*xvhs9R#4 z!n3{0l+D!E3U8PnWF8MhZ*A+}40byUN@mDcN6KaBBvcN;%@GKN5H)e9yo`#ie#L%7 zr;oYfq_L@K#e0Eh>{J)W!>7vL!5+oE6SVbf4@d9Uva2ET=dC3ACl`myWN$tST#P6? z5`~cYk@ueG)DNGXyCLvlUTpsSvy{XG1j;~MFVlZ5*ml|Hg?|D=?6 z(0yKk@kbr73#kW2$>-toXIcO?tRd~cIsER0_^Q+qo#*Q+%5whz@`4pDC}4b`g*wf8prx`cPT*QIz-_XZjK zA`ROXbI)G1Ht!m@&Al2f2jn#&9SF9aF1)C>NOrrWqX;S;1=bMWrQT;{E(}7NH1-WB>vew>!jhmV=62$3 zf6jf&#dk7IC7OD~`{I2auABy1pV?5-EQ4)B2dbO#=Iy`ffA&Xj{gT|TpZ81A+3gR| zPuJp(c6Z9}oK4>Jv(H|#WZtHEV1r-Zublh7r>x%Un?!Gp_W%@!)&-q=q*arSU}5uC z`RsSdo&L@{FFgP5&|9~`7r=gsB<%gv)SX{#{m#7ezCqsC-};8wiqs51`M`1G=GP;` z3LX}UTG5;^syNXF`iJVzZ=f%haGJ;}R(-Dbo z+29(MSX`2$cD!H~m~(^qW!a5yWkIurT%ll#gC&I0(m;*K)MUuJENr*N2jpblDrd7| za7fN&D^@Nk9%z(p*fYrK=+4RzjKHWU9hB_?z@VpD3t-VS5t@qIQBhhfTM#Rtnwl!7 z^(<^%@xX|jOIJ)dl!sd6Y}^VZW1{h9q+npMn#gv_DXw9PgJHR#=P>wspOJcnzy{m~ zWJcrBs4f3N;`bNlK)2F>L@%(pj){=>lNTU4m?=l`H8c zx@phKhma4qXAce!t=xm0y-B~lgL6C(-giP7q*(Zgt?Y*rk3B9sHf3~MY~Cj8wrYY! zUB3{V1R0xbCc;1r?9P2}WVE+;xH!xznNiS$dyRXI9NJa5e|UIw^#0uL4wyTBabUy{ z*IzGdP^=tX3^l_Q0+H&7#~4D8Y+BBJcsBCk3O3DB@tDR_pK2Zchx0 zWy|DPtdnAS(L5x>NT?MG;=u>y#(YD(wY8-=zPj9C!D9pM)LR5bY_Kyl6>}n~2ofB( z!~%iV*7$~8qj=y!xlrh)d`t{&mJ3npiblnX5F~OhndG~DZ3!|I1Z*#xmewN(R=~oxOa!wsxH_|Ql zBW?7N`|rnr?!Sd@q#JL!#laEDF`%F zU?Xtw9r1`pIT}+roVRIU%Qk{PWB`YXT8<*bFe0x%S3yBeqbX$yNDM?CIpwoRwn4nX zH|W>N1vL|eG1L(ZB6{I28=I!gqHC|ES%Ri|2uy6EEn8?4=6I1@Z$h|vlI!iDw|Kg3 z%fKdtynM-i;NE)=&;h!4HK$2JvLnN@3`?n=+zH*| z2MB+v3%}UY4?XlWiS^#=%3nkApHIh5_czLHT8K{}xEIHYK32?LSa=9|!>no?p7ys* z8`l||sDM~NIB3?JMhtN8u3dWpu%>|AKw^vq7nTN(?U7sVXKLd}$XR2vVK5hyg;+kC zj=+cyB_l`~jYX1d(MQtJe5{aUd$*j1`=pRBrps7;d+2YkWs^C4HB?F>1Hxd!E~m;)DUCF{bT*xF zGLWI{+!k4=f*FpcDOYMR;80oiF7KPg0tL>xOq?wvQa~!u-e6L zgiKdCTnbgy9<2Xrrc^GMkg|vywHhjg%Uu~Pcu)XO<$tFh&t?;(WIMK43$nmA&}celi?|(wO5!h9aJ5Cs zC=EsX+xl9O*|m{2Mw{DOTicp}iH+1;Xzgq3j}Fl&jTVOb`uqEa3Zo#bk9bWWV~*)C z3Fngq6?r_#TC!@e3#OXFS7&L6h>ZUsTN;ry4lxxdk6ab*PCA)UGx2mh9dlwfP-sU} z$gi;?77PubHA1Z_ENKyr1XN6p2j_h&1u|jeNUK%kQ6Ur6;vZILs%RJOyj{R2b7(7* z%cK#yN#|^lLsDG<`1uIF9J_-W!_6%%&EZDGi0&vg4mJ<9jD+u`J87geG&nd^8o}kA z;gOc1=E26&9rbCPh#?|P*hu)35mV#INHUlVYC!{ZHxNwrWsRyZRFNY{JD5;hoA>tJMlV%-D({ zBAL`giV?Du%0^Ku=-{Y8b3x4^3n&}QK&b^GrH-U`w!95rJj-BCg#92jfU{wJ0qti6 zu=fEnxGw8CEB1r51D5H&BEVEZ_(t)6657Q7L1>fQ3O?;gvZI(lhO+K`LC1%MvUj3; zhAt4&cfUxOblG;lkaEv}ggVhX!xqWIF(`Mk_bK~KS4z2`vR&ofKe!4B2Ngc0|G|?C z?^C*`oN=ayhe3BfvhCn?hGpbuJUHnzJMi#VKf!;&c@PLfN8>SMM|B}jK}NzJ_&PqIKssY4lLd)pL7^}t#}`EwivpY-yd57nA^B0j5(Z22 z!+>xV!l}ZU)o|Nr2n-^O&)==VZy#(VxiSOs*-!-wue)64L}$1_k(?L`a-#EI^ZIn;oKIcIDMcztIm*dm~|J}n2EjpkxUp|dZ_G!2lTX;?bN9%CptgdzYL z9PBK!pzwCEwhfmSRIjhFe-wr{e!dUK!vlOrzyaj1!@C>wQ$#BjKV1}#d^8w(e`tQr zz)?fXs#zYI+Y4`54rYu&;)|Y_2EaA{)Cd6Cn#6cqQ}j9k3emrSB+kAL__# z$7iyr6wzXwa}Nd%rUXup7x;7rd4F~uIrq7OUBo!=+kmt?Hd5I&4{IFOt-txndr75`pG}KsImeLqI~e zf+b;ql(7mpgBJk*H;Cy2nb$uv@ud_#GXc#PKKRTe=hVOcD7^of3EG2g1mk%N zb@Z^Z-P3~u^>na8-qEoIkbl6V@J)da>^H)kKzL0WyW$DOo8eyQ&U7zvE*&|ek11|7e zgicZV5|?Xm@D0la!8c?gc$c9)UbE~rLL@yU+{+Ljwh{hA2T&5es!8sJsE@iIw8-yJ z0xfcVuE+Hm4nv%cj4MD#8-8CW{VTGST{P}q=*{q*H#YhPhZr0@m$;X4^bV^S90CkO zc(c9BeAgC#rR)!C(%4Kybn1<}GwNu7$pX-Dl3jw*+%7x4{7e9MHXzoaBSH>@q5H=y zDy`=>|6u7u%MM&MGS~X6!tw{klbiS6y!Ymz`R3K{%gfi?pDGt!eDQ1OA_tOu|C}aX zx#*&cd6tmgP*2qXsyJogwO3xbNM@dRr0d*ie86_`Yp=Z`bI=FlXDlKy=-3DF-oG(Kzoxh`@h zbP;isE^<|B!PXTItazaLDeE8qx;o;X<|Y;IqwdEMApw4QB><=5cb?=mIeyTK#shOE z;tZTX+@yKZmyn&xqyi$TW15)8Kk1&T;(Kv_`!M|e=siTtH8d?=N;A9D=_J^thG z|CCIwrnS^V}zn<{ko1d9DUc-NZ z!vtvpN}b|E0i=DQQ%+iO%Ej+WALS+_>Dis<{p`s3z4zYx*>NYLPy9c0>aV%J#C^p- zMUn8{J?=yw5?490U2x=r&)iwAdJOvphKO>t#pXGu+d$UqAi~|6Rv# z3p3)MXN{j1;QVpyXN});y%VvYg#E|Zuf^VveF*#2<2#pmf0v{Ml2jkrB>dYP9u^Od z{})jG`Z)YEo^!{qkH_=RjbBg1^+n^?vh+#Z)ysbb^K$0+^-0oKrAv99CNee|X8pPj zvwmHNS--BstY6n*)~`Q;x?dizTZcJcnj>8+-6*ZWzW{2MZkHORjne7(M?vRF=i^@l z;T``=qI#i)D6~%6A~i_2qHz7$Ts+(8SH4wh!Fe?*uar7)oQMA`)F@qpok99N=Hp-7 F{x7dTD}ew2 literal 0 HcmV?d00001 From 0c2a7ac24745b31c15ccdbeee99326d585c85109 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 28 May 2014 16:32:37 +1000 Subject: [PATCH 02/73] Adding style sheet to allow access to custom font --- app/assets/stylesheets/darkswarm/style.css | 173 +++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100755 app/assets/stylesheets/darkswarm/style.css diff --git a/app/assets/stylesheets/darkswarm/style.css b/app/assets/stylesheets/darkswarm/style.css new file mode 100755 index 0000000000..44887cb970 --- /dev/null +++ b/app/assets/stylesheets/darkswarm/style.css @@ -0,0 +1,173 @@ +@font-face { + font-family: 'OFN'; + src:url('/OFN.eot'); + src:url('/OFN.eot') format('embedded-opentype'), + url('/OFN.woff') format('woff'), + url('/OFN.ttf') format('truetype'), + url('/OFN.svg') format('svg'); + font-weight: normal; + font-style: normal; +} + +[class^="ofn-"], [class*=" ofn-"] { + font-family: 'OFN'; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + font-size: 1.5; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.ofn-i_049-web:before { + content: "\e600"; +} +.ofn-i_048-play-video:before { + content: "\e601"; +} +.ofn-i_047-youtube:before { + content: "\e602"; +} +.ofn-i_046-g:before { + content: "\e603"; +} +.ofn-i_045-pintrest:before { + content: "\e604"; +} +.ofn-i_044-facebook:before { + content: "\e605"; +} +.ofn-i_043-instagram:before { + content: "\e606"; +} +.ofn-i_042-twitter:before { + content: "\e607"; +} +.ofn-i_041-twitter:before { + content: "\e608"; +} +.ofn-i_040-hub:before { + content: "\e609"; +} +.ofn-i_039-delivery:before { + content: "\e60a"; +} +.ofn-i_038-takeaway:before { + content: "\e60b"; +} +.ofn-i_037-map:before { + content: "\e60c"; +} +.ofn-i_036-producers:before { + content: "\e60d"; +} +.ofn-i_035-groups:before { + content: "\e60e"; +} +.ofn-i_034-timer:before { + content: "\e60f"; +} +.ofn-i_033-open-sign:before { + content: "\e610"; +} +.ofn-i_032-closed-sign:before { + content: "\e611"; +} +.ofn-i_031-alarm-clock:before { + content: "\e612"; +} +.ofn-i_030-money:before { + content: "\e613"; +} +.ofn-i_029-shopping-basket:before { + content: "\e614"; +} +.ofn-i_028-barcode:before { + content: "\e615"; +} +.ofn-i_027-shopping-cart:before { + content: "\e616"; +} +.ofn-i_026-trash:before { + content: "\e617"; +} +.ofn-i_025-notepad:before { + content: "\e618"; +} +.ofn-i_024-mail:before { + content: "\e619"; +} +.ofn-i_023-refresh:before { + content: "\e61a"; +} +.ofn-i_022-cog:before { + content: "\e61b"; +} +.ofn-i_021-tools:before { + content: "\e61c"; +} +.ofn-i_020-search:before { + content: "\e61d"; +} +.ofn-i_019-map-pin:before { + content: "\e61e"; +} +.ofn-i_018-unlocked:before { + content: "\e61f"; +} +.ofn-i_017-locked:before { + content: "\e620"; +} +.ofn-i_016-group:before { + content: "\e621"; +} +.ofn-i_015-user:before { + content: "\e622"; +} +.ofn-i_014-menu:before { + content: "\e623"; +} +.ofn-i_013-help:before { + content: "\e624"; +} +.ofn-i_012-warning:before { + content: "\e625"; +} +.ofn-i_011-spinner:before { + content: "\e626"; +} +.ofn-i_010-bullet:before { + content: "\e627"; +} +.ofn-i_009-close:before { + content: "\e628"; +} +.ofn-i_008-caret-left:before { + content: "\e629"; +} +.ofn-i_007-caret-right:before { + content: "\e62a"; +} +.ofn-i_006-caret-up:before { + content: "\e62b"; +} +.ofn-i_005-caret-down:before { + content: "\e62c"; +} +.ofn-i_004-x:before { + content: "\e62d"; +} +.ofn-i_003-check:before { + content: "\e62e"; +} +.ofn-i_002-arrow-right:before { + content: "\e62f"; +} +.ofn-i_001-arrow-left:before { + content: "\e630"; +} From 8954caf3e0eae6715724d133cebbe712a4ed7904 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 28 May 2014 16:33:01 +1000 Subject: [PATCH 03/73] Applying new icon font to active table on homepage --- app/views/home/_fat.html.haml | 2 +- app/views/home/_skinny.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/home/_fat.html.haml b/app/views/home/_fat.html.haml index 9382844265..caddc00d8a 100644 --- a/app/views/home/_fat.html.haml +++ b/app/views/home/_fat.html.haml @@ -22,4 +22,4 @@ .columns.small-1.text-right %a{"bo-href" => "hub.path"} - %i.fi-arrow-right + %i.ofn-i_007-caret-right diff --git a/app/views/home/_skinny.html.haml b/app/views/home/_skinny.html.haml index fcf860575e..4f68badf5a 100644 --- a/app/views/home/_skinny.html.haml +++ b/app/views/home/_skinny.html.haml @@ -10,4 +10,4 @@ .columns.small-3{"bo-if" => "!hub.active"} Orders closed .columns.small-1.text-right - %i{"ng-class" => "{'fi-arrow-down' : !open(), 'fi-arrow-up' : open()}"} + %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"} From 7185aa6ab6d5d4e05d765d929118ea55f25bf5c3 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 28 May 2014 16:38:01 +1000 Subject: [PATCH 04/73] Applying new icon font to groups partial on homepage --- app/views/home/_groups.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/home/_groups.html.haml b/app/views/home/_groups.html.haml index dd55a9bcd1..5d76dd1e2d 100644 --- a/app/views/home/_groups.html.haml +++ b/app/views/home/_groups.html.haml @@ -6,5 +6,5 @@ %h5 See all the groups & regions on the Open Food Network %p %a.neutral-btn.light{href: "/groups"} - %i.fi-torsos-all + %i.ofn-i_035-groups View groups & regions \ No newline at end of file From 4c832b6ae989f68164bd0c369ae34adc467d3e62 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 28 May 2014 16:39:26 +1000 Subject: [PATCH 05/73] Applying new icon font to producers partial on homepage --- app/views/home/_producers.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/home/_producers.html.haml b/app/views/home/_producers.html.haml index 31a573d610..3d4fcfbd68 100644 --- a/app/views/home/_producers.html.haml +++ b/app/views/home/_producers.html.haml @@ -6,5 +6,5 @@ %h5 Looking for a specific producer or farmer? %p %a.neutral-btn.turquoise{href: "/producers"} - %i.fi-trees + %i.ofn-i_036-producers View all producers \ No newline at end of file From d3802e9f83438fb806620fc9ab23e49ffc2c6b32 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 28 May 2014 16:43:06 +1000 Subject: [PATCH 06/73] Applying new icon font to map partial on homepage --- app/views/home/_map.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/home/_map.html.haml b/app/views/home/_map.html.haml index 29224493e2..8d83e58c40 100644 --- a/app/views/home/_map.html.haml +++ b/app/views/home/_map.html.haml @@ -6,5 +6,5 @@ %h5 of all our food hubs and producers %p %button.neutral-btn.light - %i.fi-map + %i.ofn-i_037-map View map \ No newline at end of file From 6ea7988f4e5a3a19ac9cacd50c569278efa56b44 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 28 May 2014 17:06:06 +1000 Subject: [PATCH 07/73] New version fonts --- app/assets/stylesheets/darkswarm/style.css | 13 ++++++------- public/OFN.eot | Bin 31132 -> 31140 bytes public/OFN.svg | 2 +- public/OFN.ttf | Bin 30984 -> 30992 bytes public/OFN.woff | Bin 18936 -> 18940 bytes 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/style.css b/app/assets/stylesheets/darkswarm/style.css index 44887cb970..962390c353 100755 --- a/app/assets/stylesheets/darkswarm/style.css +++ b/app/assets/stylesheets/darkswarm/style.css @@ -1,10 +1,10 @@ @font-face { font-family: 'OFN'; - src:url('/OFN.eot'); - src:url('/OFN.eot') format('embedded-opentype'), - url('/OFN.woff') format('woff'), - url('/OFN.ttf') format('truetype'), - url('/OFN.svg') format('svg'); + src:url('/OFN.eot?nugltz'); + src:url('/OFN.eot?#iefixnugltz') format('embedded-opentype'), + url('/OFN.woff?nugltz') format('woff'), + url('/OFN.ttf?nugltz') format('truetype'), + url('/OFN.svg?nugltz#OFN') format('svg'); font-weight: normal; font-style: normal; } @@ -17,7 +17,6 @@ font-variant: normal; text-transform: none; line-height: 1; - font-size: 1.5; /* Better Font Rendering =========== */ -webkit-font-smoothing: antialiased; @@ -45,7 +44,7 @@ .ofn-i_043-instagram:before { content: "\e606"; } -.ofn-i_042-twitter:before { +.ofn-i_042-linkedin:before { content: "\e607"; } .ofn-i_041-twitter:before { diff --git a/public/OFN.eot b/public/OFN.eot index 5b07d8beed6779132ee60b39623f71f16ed01867..cf85b7a5cbf175e005bca8ebe368c9ddf30bdbf1 100755 GIT binary patch delta 353 zcmbR9nQ_TyM%E>j3=9GjSOIR<}${2M?!L<{nZOBk4eG7J?TK=KUCOq+ulIr8eaGE86$Wi((A zVbB7qGm>Ls7vp16R?=fqw_`R|SK?z5XOm+xHnL+f*JD;TW@P1+5a4EH^bAs$y>^6g3t27iJ43qU(W3-XIg7?^=F3>7ax@(j#On}ZoS^7w8r>|oSj - + diff --git a/public/OFN.ttf b/public/OFN.ttf index 679180d708bad13a9a892cf44656d6489e6375f0..ad8f6109bccf8950255f9ea440788175feea4825 100755 GIT binary patch delta 337 zcmeD9#5e(n9O{c1R_8M?FcvT{l&r}}O-x~^-DbeRP$t8`z+jdE6kvYM#0%ty0Qo8z zxg{0JjI3vX{0bodN=|-qBHwMjI}8lvK0tm>Zem3NLj-dUkiP@SSIA4uO>LiJ@E6Fx z0klK3AiubTff*>nQ1JmI&%n&IaX&|1{Z@tvjG>GM3?d9#KxIa9OzdKOOv*}nOzL*b z#_CFZOyX>EOvXlbOy+vb%EpYWyb=Q3jEvj@61;q3!kmnZoWf#!jQnz%C@3q+3!@nrH{0dkW0Mg(?%NX2Z}XLbn+fDX whV!efcERY$7G=*Fw@y|luN8h}Zed+&p!-Y3_#$yg@JMMLr<}ZI^6XS85mq2cByyxu8AU<3eU8E3g8bqVpxf_Ed=bWYW3xTubw=St`+fHR9PAuw9rilbImtNPb6&Dp zlUdo`X6E-TqU*bt=XGavXXNLl1F5_f-Rrv7tyr+&mRn23_#$yfq`-ILr<}ZI^6a57#Ljd1s;uK_7B!K zVqkE)0+dexVGgA~&ysT!3m6#OO@MqK5S9u()1IDK3=(Sq@;RVbAR{#~1t``50tIL>~z{ci_rhbo6%j@3?*PPd&G zZq{U0wzr(}-AA;vyK-*#!tRB0=K_iDxs~0e-KCY4rQICer$y_!8ydRny6dJj%;=uc zJ#8A0n9(q;uA5_Xhf@H{o@bH(%9d}ZKf0=kNU;rwd7`!IU)2KVQTH#X1k HNMQs3h(~cc From 3f36a3785be9d819acad1f7b6646803263682542 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 28 May 2014 17:06:34 +1000 Subject: [PATCH 08/73] Adding in icon for list style from new OFN icon font --- app/assets/stylesheets/darkswarm/typography.css.sass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass index 63d4efe13f..aad9fa7237 100644 --- a/app/assets/stylesheets/darkswarm/typography.css.sass +++ b/app/assets/stylesheets/darkswarm/typography.css.sass @@ -37,18 +37,20 @@ h1, h2, h3, h4, h5, h6, .avenir padding: 0px ul.ofn-list - margin-left: 0.5em + margin: 0 li list-style: none + line-height: 1.5 + height: inherit li:before - content: "\f112" - font-family: "foundation-icons" + content: "\e627" + font-family: "OFN" display: inline-block font-weight: normal font-style: normal font-variant: normal text-transform: none - font-size: 80% + .light-grey color: #666666 From 614b25c446aac4b987ded5fe22c1cdee2eab86b1 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 28 May 2014 17:06:52 +1000 Subject: [PATCH 09/73] Applying new icon font to footer partial on homepage --- app/views/shared/_footer.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index bb33312652..66d50def5c 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -9,13 +9,13 @@ %h4 Follow us %p %a{title:'Follow us on Facebook', href: 'https://www.facebook.com/OpenFoodNet', target: '_blank'} - %i.fi-social-facebook + %i.ofn-i_044-facebook Facebook    %a{title:'Follow us on Twitter', href: 'https://twitter.com/OpenFoodNet', target: '_blank'} - %i.fi-social-twitter + %i.ofn-i_041-twitter Twitter    %a{title:'Join our group on LinkedIn', href: 'http://www.linkedin.com/groups/Open-Food-Foundation-4743336', target: '_blank'} - %i.fi-social-linkedin + %i.ofn-i_042-linkedin LinkedIn .small-12.medium-4.columns.text-left %h4 Getting around From 45f6a86fd261e22d176374f448b5f5c5b2c89866 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 10:19:50 +1000 Subject: [PATCH 10/73] Adding new icons to menu partials --- app/views/shared/menu/_large_menu.html.haml | 2 +- app/views/shared/menu/_mobile_menu.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml index 7a72b80f60..79e6c286ca 100644 --- a/app/views/shared/menu/_large_menu.html.haml +++ b/app/views/shared/menu/_large_menu.html.haml @@ -44,7 +44,7 @@ %li.divider %li.cart %a.icon{href: cart_url} - %i.fi-shopping-cart.nav-branded + %i.ofn-i_027-shopping-cart.nav-branded %span = cart_count items diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index 5e9f22c597..f796490b65 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -4,7 +4,7 @@ %span %section.right %a.nav-branded.icon{href: cart_url} - %i.fi-shopping-cart + %i.ofn-i_027-shopping-cart %span = cart_count items From 4971e2305f2a69e75a0e7bd2a846b2e0728a0d68 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 10:54:07 +1000 Subject: [PATCH 11/73] Add hub icon to modal --- app/views/modals/_food_hub.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_food_hub.html.haml b/app/views/modals/_food_hub.html.haml index 9b559d26cc..fc5cb36019 100644 --- a/app/views/modals/_food_hub.html.haml +++ b/app/views/modals/_food_hub.html.haml @@ -1,4 +1,6 @@ -%h2 Food Hubs +%h2 + %i.ofn-i_040-hub + Food Hubs %h5 Our food hubs are the point of contact between you and the people who make your food! %p You can search for a convenient hub by location or name. Some hubs have multiple points where you can pick-up your purchases, and some will also provide delivery options. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected. %p You can only shop one food hub at a time. From 8f7bab4ab7adf790e036683db67cbd691ad2e914 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 10:54:27 +1000 Subject: [PATCH 12/73] Add hub icon to active table --- app/views/home/_skinny.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/home/_skinny.html.haml b/app/views/home/_skinny.html.haml index 4f68badf5a..8798e504a6 100644 --- a/app/views/home/_skinny.html.haml +++ b/app/views/home/_skinny.html.haml @@ -1,5 +1,6 @@ .row.active_table_row{"ng-click" => "toggle()", "ng-class" => "{'closed' : !open()}"} .columns.small-4 + %i.ofn-i_040-hub %strong {{ hub.name }} .columns.small-3 {{ hub.address.city }} From ff1c5a13e782ddbf6f0d216f96df27defa9909a2 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 11:01:49 +1000 Subject: [PATCH 13/73] Add producers icon to active table --- app/views/producers/_skinny.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/producers/_skinny.html.haml b/app/views/producers/_skinny.html.haml index c87c2295ed..a5608b8b3d 100644 --- a/app/views/producers/_skinny.html.haml +++ b/app/views/producers/_skinny.html.haml @@ -1,9 +1,10 @@ .row.active_table_row{"ng-click" => "toggle()", "ng-class" => "{'closed' : !open()}"} .columns.small-4 + %i.ofn-i_036-producers %strong {{ producer.name }} .columns.small-3 {{ producer.address.city }} .columns.small-4 {{ producer.address.state | uppercase }} .columns.small-1.text-right - %i{"ng-class" => "{'fi-arrow-down' : !open(), 'fi-arrow-up' : open()}"} + %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"} \ No newline at end of file From 1248eaeed7648225360cfd2c8a1f568c7cfbbae3 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 11:05:28 +1000 Subject: [PATCH 14/73] Add producers icon to modal --- app/views/modals/_producers.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_producers.html.haml b/app/views/modals/_producers.html.haml index 89d8ccabae..d3be6e56c3 100644 --- a/app/views/modals/_producers.html.haml +++ b/app/views/modals/_producers.html.haml @@ -1,3 +1,5 @@ -%h2 Producers +%h2 + %i.ofn-i_036-producers + Producers %p Our producers make all the delicious food you can shop for on the Open Food Network. %a.close-reveal-modal{"ng-click" => "cancel()"} × \ No newline at end of file From 81f51e734c448ec3218bdf80d634de0adf7b3457 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 11:07:43 +1000 Subject: [PATCH 15/73] Add groups icon to listings on page --- app/views/groups/index.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml index fdbf8c5ee6..0e9ae1b185 100644 --- a/app/views/groups/index.html.haml +++ b/app/views/groups/index.html.haml @@ -24,7 +24,9 @@ .group-hero %img.group-hero-img{"bo-src" => "{{group.promo_image}}"} %img.group-logo{"bo-src" => "group.logo"} - %h3.group-name {{ group.name }} + %h3.group-name + %i.ofn-i_035-groups + {{ group.name }} %h5.group-description {{ group.description }} / Will - scale large images down to 1200px wide, crop in to img aspect ratio 60W:13H From b8eb43f8db5ffd05284280e356d2b1bc429f3de1 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 11:08:35 +1000 Subject: [PATCH 16/73] Add groups icon to modal --- app/views/modals/_groups.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_groups.html.haml b/app/views/modals/_groups.html.haml index 80e210c98a..a97b9982c7 100644 --- a/app/views/modals/_groups.html.haml +++ b/app/views/modals/_groups.html.haml @@ -1,4 +1,6 @@ -%h2 Groups / Regions +%h2 + %i.ofn-i_035-groups + Groups / Regions %p These are the organisations and relationships between hubs which make up the Open Food Network. %p Some groups are clustered by location or council, others by non-geographic similarities. %a.close-reveal-modal{"ng-click" => "cancel()"} × \ No newline at end of file From 68ab24b7907e497e60e6148211c64ef306a2fa98 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 11:10:45 +1000 Subject: [PATCH 17/73] Add links into footer --- app/views/shared/_footer.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index 66d50def5c..ee13a29d47 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -21,13 +21,13 @@ %h4 Getting around %ul.ofn-list %li - %a{href: ""} Shop + %a{href: "/map"} Shop %li - %a{href: ""} Map + %a{href: "/map"} Map %li - %a{href: ""} Producers + %a{href: "/producers"} Producers %li - %a{href: ""} Groups + %a{href: "/groups"} Groups .small-12.medium-4.columns.text-left %h4 About us %p OFN is a network of independent online food stores that connect farmers and food hubs with individuals and local businesses. It gives farmers and food hubs an easier and fairer way to distribute their food. From 39358247fd1ccc0a13a8a01a6f96beef35acdcaf Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 11:47:06 +1000 Subject: [PATCH 18/73] Kill whitespace around icon --- app/views/modals/_food_hub.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/modals/_food_hub.html.haml b/app/views/modals/_food_hub.html.haml index fc5cb36019..c6fcf4155b 100644 --- a/app/views/modals/_food_hub.html.haml +++ b/app/views/modals/_food_hub.html.haml @@ -1,5 +1,5 @@ %h2 - %i.ofn-i_040-hub + %i.ofn-i_040-hub> Food Hubs %h5 Our food hubs are the point of contact between you and the people who make your food! %p You can search for a convenient hub by location or name. Some hubs have multiple points where you can pick-up your purchases, and some will also provide delivery options. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected. From 86dee82acbba966ef799e00aadce0077f2fd2b43 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 11:59:28 +1000 Subject: [PATCH 19/73] Add search icon into search input on hubs --- app/views/home/_hubs.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/home/_hubs.html.haml b/app/views/home/_hubs.html.haml index cc893f5997..7d28d28508 100644 --- a/app/views/home/_hubs.html.haml +++ b/app/views/home/_hubs.html.haml @@ -10,10 +10,10 @@ %ofn-modal{title: "food hub"} = render partial: "modals/food_hub" from the list below: - %p - #active-table-search.row + #active-table-search.row.pad-top .small-12.columns + %i.ofn-i_020-search %input{type: :text, "ng-model" => "query", placeholder: "Search postcode, suburb or hub name...", From 4f1c7345c5d0edce8a64bf3c365bd30f4920267c Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 11:59:55 +1000 Subject: [PATCH 20/73] Add search icon into search input on producers page --- app/views/producers/index.haml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/producers/index.haml b/app/views/producers/index.haml index 41ef76680b..a5b1601ce3 100644 --- a/app/views/producers/index.haml +++ b/app/views/producers/index.haml @@ -4,17 +4,18 @@ -#%pre -#{{ Producers.producers | json }} - #active-table-search.row - .small-12.columns.text-center - %p + .row + .small-12.columns.text-center.pad-top %h1 Producers %div Select a %ofn-modal{title: "producer"} = render partial: "modals/producers" from the list below: - %p + #active-table-search.row.pad-top + .small-12.columns + %i.ofn-i_020-search %input{type: :text, "ng-model" => "query", placeholder: "Search postcode, suburb or hub name...", From c81631118dd563c90bb2ecf828bb43d609ca64f9 Mon Sep 17 00:00:00 2001 From: summerscope Date: Thu, 29 May 2014 12:00:16 +1000 Subject: [PATCH 21/73] Add styling to include the search icon in big input searches for Hubs and Producers --- .../darkswarm/active_table_search.css.sass | 19 ++++++++++++++++--- app/assets/stylesheets/darkswarm/mixins.sass | 5 +++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/active_table_search.css.sass b/app/assets/stylesheets/darkswarm/active_table_search.css.sass index 5b70800bab..e558c41511 100644 --- a/app/assets/stylesheets/darkswarm/active_table_search.css.sass +++ b/app/assets/stylesheets/darkswarm/active_table_search.css.sass @@ -1,6 +1,19 @@ @import mixins #active-table-search - input - font-size: 2em - @include big-input \ No newline at end of file + position: relative + + i.ofn-i_020-search + position: absolute + left: 26px + top: 12px + font-size: 1.6em + z-index: 999 + color: #b2b2b2 + + input[type="text"] + font-size: 2em + @include csstrans + @include big-input + padding-left: 44px + \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass index fd26cfcae9..aa44d4c4b5 100644 --- a/app/assets/stylesheets/darkswarm/mixins.sass +++ b/app/assets/stylesheets/darkswarm/mixins.sass @@ -12,9 +12,14 @@ border: 1px solid #999 font-size: 18px @extend .avenir + box-shadow: 0 padding: 0.75em 1em height: auto margin-bottom: 1em + background: rgba(255,255,255,0.65) + &:active, &:hover, &:focus + background: rgba(255,255,255,1) + border-color: #888 @mixin disabled color: $disabled-bright From 0eb4e35ee430eac0b2ca78008d346eeee02783ba Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:30:30 +1000 Subject: [PATCH 22/73] New version of icon font --- app/assets/stylesheets/darkswarm/style.css | 126 ++++++++++++--------- public/OFN.eot | Bin 31140 -> 31948 bytes public/OFN.svg | 104 +++++++++-------- public/OFN.ttf | Bin 30992 -> 31800 bytes public/OFN.woff | Bin 18940 -> 19496 bytes 5 files changed, 127 insertions(+), 103 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/style.css b/app/assets/stylesheets/darkswarm/style.css index 962390c353..94980106af 100755 --- a/app/assets/stylesheets/darkswarm/style.css +++ b/app/assets/stylesheets/darkswarm/style.css @@ -1,10 +1,10 @@ @font-face { font-family: 'OFN'; - src:url('/OFN.eot?nugltz'); - src:url('/OFN.eot?#iefixnugltz') format('embedded-opentype'), - url('/OFN.woff?nugltz') format('woff'), - url('/OFN.ttf?nugltz') format('truetype'), - url('/OFN.svg?nugltz#OFN') format('svg'); + src:url('/OFN.eot?-zgemuq'); + src:url('/OFN.eot?#iefix-zgemuq') format('embedded-opentype'), + url('/OFN.woff?-zgemuq') format('woff'), + url('/OFN.ttf?-zgemuq') format('truetype'), + url('/OFN.svg?-zgemuq#OFN') format('svg'); font-weight: normal; font-style: normal; } @@ -23,150 +23,168 @@ -moz-osx-font-smoothing: grayscale; } -.ofn-i_049-web:before { +.ofn-i_055-point-left:before { content: "\e600"; } -.ofn-i_048-play-video:before { +.ofn-i_054-point-right:before { content: "\e601"; } -.ofn-i_047-youtube:before { +.ofn-i_053-point-up:before { content: "\e602"; } -.ofn-i_046-g:before { +.ofn-i_052-point-down:before { content: "\e603"; } -.ofn-i_045-pintrest:before { +.ofn-i_051-check-big:before { content: "\e604"; } -.ofn-i_044-facebook:before { +.ofn-i_050-mail-circle:before { content: "\e605"; } -.ofn-i_043-instagram:before { +.ofn-i_049-web:before { content: "\e606"; } -.ofn-i_042-linkedin:before { +.ofn-i_048-play-video:before { content: "\e607"; } -.ofn-i_041-twitter:before { +.ofn-i_047-youtube:before { content: "\e608"; } -.ofn-i_040-hub:before { +.ofn-i_046-g:before { content: "\e609"; } -.ofn-i_039-delivery:before { +.ofn-i_045-pintrest:before { content: "\e60a"; } -.ofn-i_038-takeaway:before { +.ofn-i_044-facebook:before { content: "\e60b"; } -.ofn-i_037-map:before { +.ofn-i_043-instagram:before { content: "\e60c"; } -.ofn-i_036-producers:before { +.ofn-i_042-linkedin:before { content: "\e60d"; } -.ofn-i_035-groups:before { +.ofn-i_041-twitter:before { content: "\e60e"; } -.ofn-i_034-timer:before { +.ofn-i_040-hub:before { content: "\e60f"; } -.ofn-i_033-open-sign:before { +.ofn-i_039-delivery:before { content: "\e610"; } -.ofn-i_032-closed-sign:before { +.ofn-i_038-takeaway:before { content: "\e611"; } -.ofn-i_031-alarm-clock:before { +.ofn-i_037-map:before { content: "\e612"; } -.ofn-i_030-money:before { +.ofn-i_036-producers:before { content: "\e613"; } -.ofn-i_029-shopping-basket:before { +.ofn-i_035-groups:before { content: "\e614"; } -.ofn-i_028-barcode:before { +.ofn-i_034-timer:before { content: "\e615"; } -.ofn-i_027-shopping-cart:before { +.ofn-i_033-open-sign:before { content: "\e616"; } -.ofn-i_026-trash:before { +.ofn-i_032-closed-sign:before { content: "\e617"; } -.ofn-i_025-notepad:before { +.ofn-i_031-alarm-clock:before { content: "\e618"; } -.ofn-i_024-mail:before { +.ofn-i_030-money:before { content: "\e619"; } -.ofn-i_023-refresh:before { +.ofn-i_029-shopping-basket:before { content: "\e61a"; } -.ofn-i_022-cog:before { +.ofn-i_028-barcode:before { content: "\e61b"; } -.ofn-i_021-tools:before { +.ofn-i_027-shopping-cart:before { content: "\e61c"; } -.ofn-i_020-search:before { +.ofn-i_026-trash:before { content: "\e61d"; } -.ofn-i_019-map-pin:before { +.ofn-i_025-notepad:before { content: "\e61e"; } -.ofn-i_018-unlocked:before { +.ofn-i_024-mail:before { content: "\e61f"; } -.ofn-i_017-locked:before { +.ofn-i_023-refresh:before { content: "\e620"; } -.ofn-i_016-group:before { +.ofn-i_022-cog:before { content: "\e621"; } -.ofn-i_015-user:before { +.ofn-i_021-tools:before { content: "\e622"; } -.ofn-i_014-menu:before { +.ofn-i_020-search:before { content: "\e623"; } -.ofn-i_013-help:before { +.ofn-i_019-map-pin:before { content: "\e624"; } -.ofn-i_012-warning:before { +.ofn-i_018-unlocked:before { content: "\e625"; } -.ofn-i_011-spinner:before { +.ofn-i_017-locked:before { content: "\e626"; } -.ofn-i_010-bullet:before { +.ofn-i_016-group:before { content: "\e627"; } -.ofn-i_009-close:before { +.ofn-i_015-user:before { content: "\e628"; } -.ofn-i_008-caret-left:before { +.ofn-i_014-menu:before { content: "\e629"; } -.ofn-i_007-caret-right:before { +.ofn-i_013-help:before { content: "\e62a"; } -.ofn-i_006-caret-up:before { +.ofn-i_012-warning:before { content: "\e62b"; } -.ofn-i_005-caret-down:before { +.ofn-i_011-spinner:before { content: "\e62c"; } -.ofn-i_004-x:before { +.ofn-i_010-bullet:before { content: "\e62d"; } -.ofn-i_003-check:before { +.ofn-i_009-close:before { content: "\e62e"; } -.ofn-i_002-arrow-right:before { +.ofn-i_008-caret-left:before { content: "\e62f"; } -.ofn-i_001-arrow-left:before { +.ofn-i_007-caret-right:before { content: "\e630"; } +.ofn-i_006-caret-up:before { + content: "\e631"; +} +.ofn-i_005-caret-down:before { + content: "\e632"; +} +.ofn-i_004-x:before { + content: "\e633"; +} +.ofn-i_003-check:before { + content: "\e634"; +} +.ofn-i_002-arrow-right:before { + content: "\e635"; +} +.ofn-i_001-arrow-left:before { + content: "\e636"; +} diff --git a/public/OFN.eot b/public/OFN.eot index cf85b7a5cbf175e005bca8ebe368c9ddf30bdbf1..d748b3b44b910b55f6748e607fb2815e1c14d29c 100755 GIT binary patch delta 1984 zcmZuxeQZ-z6hG(Q_tmYoV}0$L%T{VP`Zhkw=-T(X4a&lR0UAP75;1HtKEfm$TZFix z#3uMf{EApL8^NuNNt7`*X@V{S@h=StK@5r69|jj=43Yh(#z-Rb+}8~x`d-ev_nv#+ zxxaJH@7$5!@akWvTs;hsJbX;CBr9}f)v@Ni3uXY|BFT%b^+i}i0rIRQt;c%N9(6(UESGzFx`XNIIYP!%yjka>R2|uc?ZA? zowQDOccgovop;fCn%1HH9o>6gKT-ELz>Bm*e{au$gTQGDhs(r1aF%@no6*X?k1h0_ z!e=uGQ}8A(!vvJlFYzcUUi6?IScpMP;VQ&sj7xkYn8b79 z1cV#pr>5Y?7f+$%L3g}G$jHBDpNQ$O#?EUk!ghERzDNjdZ z201e1l1vIld!kwj!0a>woCXFm6v0ABLKA?`Z`-QjH&xr@9`4tJ%nqbjA|7R?PxmlW zjq+6(PchrDf~*qFgnD$t2Um7iuK%XBGSRlare=LxVt#yA){2#%m16Btd449BZNTya z$xXN=^l$^kwgAo6?N+>fT`gkmy7suWz176Kmt?o9Afn_dQeRe!ToTO{)h)m3I?$MJ zX4|~-EzIJr{NRFph&%Hx-{adeV{jDPFbO);QX<11Ca~AX3fQasu^=fttSTI(U{b6e z<dPNjf=mnyleD;oPAn(Toltkfb4cHV>X6^2vmNR^!ypjLA$ME$oW!rk@B30qG|od*^_N zv`|CMcZ6EtqY)z@wgW^YuL}3l8DklyDyle+vy(Z>$-N*+L)kh@C*w`$;Bm)@6CCN3 zNRLRvJ)~!la8Y+ium;jNi5nmW7BoUiEn;?O&w&HX!ksco8-eWQ6Mrtd*4PB zkLsQq66F^&rpg-2d_s1UB;pYl3xigQ;4-#Aji@T6vcO1@P3Ptf(5+?6rw&t`OyY!dD#KD-Ben!#=`P|Gf~!uJ1)_7}nh_B*(Z-OEKlh4M z-LZe2{)~6!A5iSveDLkqJBI{PG0x7;{>WT-EBnLq%NNl#bpH{-ko^?N4U*A0@n=JQ zRoUfzTDGMx?H?oUT9N^hev&mLt=a2+sOz%PXN0=pw`QX(xtx@s58DUKVNaWa(ZDXbmWoi;T=_7)sgBu<{P!`i=STn{gSVi_Sc11 z{1iK0e>tAEuO*9;UCD{$?+s5j9B*uFoM=ilO%Z_sn)p6(nLD_%?;R@5_oNf}55W>C Av;Y7A delta 1131 zcmbu6O-vJE5Qb;IZMX8%Ev0l@wN%`aB4|o&VGBen#)BLXBZ5I9LW5{EAdMiF8dD=C z#ETKvlks3EQo~Q8R1Hz$Q8|!!F@!`Ddm=_Xm>3TxD$cIba4>lAFyHLEvpdf_^DTVC zu`kGv4Fcp1j_|UMd-i<)NbM=}G62j`baeKFBAc2QhDT-{@jjUB1;7YE|5UgubOJ6t z@d6Au=sP(~FSw7)NV>2()nBq-RMN zoelML4d3zpAiYEkYoxcYA2_N&^s`zAjwy$+7QM_}$!H45XL}bY6I5sxMD3L%+j;p68@7>dis;o&&WS*1B z%oh`h%zvY!nQpW#gu7&+jVwqI2Q(14fHw#zxyuP&;jXNZE67g}ePoUC25cK2M@D^h zoDQee{y3chA`Y(sO^_YU0OA8JtIi3SAYg|E1dEMOnW5t=DP0C+W7^K><@tgO6a zS(sMRgXKb{R{nFKvNz^b4#sko_E^;Vn0{@bxJ!|ss8>Vz6x$TWo4BZR>zV!qFY-?f zWrq0;?{ivn=Z!&Aoh59|6-PH--+aX}SNMI)@uI1%yQDf7b1k}0ZmTJkOJ~aNZ14B{ q^giD?;JfW_k|*R3fvP|xa6gc)vRBPkd#dMZj?g^;RHkAV8}S!+hRL=7 diff --git a/public/OFN.svg b/public/OFN.svg index 7d3bcb93dc..8190e20cbf 100755 --- a/public/OFN.svg +++ b/public/OFN.svg @@ -7,53 +7,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/OFN.ttf b/public/OFN.ttf index ad8f6109bccf8950255f9ea440788175feea4825..a40786bc416aec4e0c25e910b7009d563bfa1f99 100755 GIT binary patch delta 1977 zcmZuxeQZ-z6hG(Q_tmYoV|(qJ3+rk(`ZhjF>Dt$BgJNLNfdq+4B8E-Mhnr+$Gs7{I zP=is4qCp$YMsON~uWU&4y_|RNIrqGC zf9Lb)uXyoK%m4yFF}wmC!jC_>G@=FmnkLC5qHR06(mfTMzkVA4=M%r7J>AexQ5z@z0P)kE z-8&l6OU5^D19(Xo?C(nV_dpx(Bz}r`|DJT$t~ZW{{|0!OSoHLC_wFU2^c*OE_hJgI z_i!~@*=Bq`gKz`h!X+4kQqqiuP;sLRb#E2=Fo`P=moP5zb&PYijy4R#Tw;u^XNscG zmobUwgkgm1WT&=Zr!1O8+k$Re3z41c|8FMqfE|QU$m3?z1ekargw{#|5wT6Va1l=Y z_wM|Ib_I}8_?&E%*bYT}1&0E`r5GYxO^BQRZ6s6h087Y>?GAm&%YsK9*nqbwMFFxZ zn<1vCE+(+BNWJAvVjPn!Xoe_UDt~$R(KsjLt-o6o8p21~>%_WGI3vNI(-nnI|4s4UehDP440z-N)kIB#T8u z%q-Jg%v3{s1xAxBZdg86iDpba-17d_ot109N>#>M*VfjqZH>*YM`f*8`AI3(9+PKx za(N3@^d{EhCjY|?a4~_sK2pG5?TPqE;9}K* z5IK`%^(dG6%U!N=e`%TDaJdYBnNu&(v=ZG}>~T9BZci~L#ObV-Sp5#S?sV$nxUd4n zt{DP&2?r%u39GZ4x_ud@d*)MF8$OIsVHrLyK*WX5 z@}3(O=@&bu${PEa)Fz3`>x_eJjIKTqTY~!P3YP)yGAYZ9wP5FcI^IiDm^c`)8)| zr(ZZI)ui{V(VulM{~e0$DF@$-y|Z8773<8*%n!_gx3VpLOBc|{x&H{4NdE@Wb)wOG z_?qDn{GQ>rBlyrON(utxlKh^P>>hPz%)$K9HuVO95_s=n55uc znCmLMFsEDi1LZPAtjqF3=q4m6$g7CDi9qPWviF?nFbJaq?|IJi{XNh7zUN#10b}1G zLVysWB142B&I=bELI%J62}f2jTHAU8p~DU9ql7>na(`!_FNCN?9z@LO>>ljsBXhmT zaXdU9Y!6%`cb+>5=@-{~f;hl@rE28$$cuwL;ej@guOlBo{Xr_xBJWIz&Q?Qz!^OY*OOaJqei|7 zQP@n@>AC=#k}vdiS0YPf3>v^m^rRFI5X@A`vDCubsm;f@Y&=Vi3Nv*HKI*kI78l6X zCanrUr8TKpPL~OgspDACm<=odYcOka^NixOF)tUOFe}HTR-1CN_E4)ff<-xM^ZKC7YO@2c(0~L=7W7;JNMJOB;5h{nq!z-{cme<@FfxWtPg4XW z0ExKxmgvlkG%3=`*lhYckw~qG;Evf?dgIho`Z%m1kV!PxjOKVGN)*;B&>jGFFq zpS7sv7F8V}mPg4_&KUcDy+7noFXAV|@C;6i8SXEw1GD6<7G5ECLhJ!%=<#0uTMGM+ z96rdAR8c<}LcQu#MQ!#LDHo~70w-`T!6UXf^%saGP5es{st=M(PKQTi#oX)jBUd$5 zTSP_0t3lq(Rj%ye&d$z9nhBdx|Dc0)OVhhAh&~#eiY(!lT8v4I7>0j02x2;<9a(sX z%rFicGOL`*Unw}nin3I>mhoBDl)a|*X=-#qLpC>c=-!dLd8_%`1ucd1MOA!_g<3YO z9mgt5JSB^z6UW2$U(S~&`-O+Dde5xq3-2xWhP;oxo8_kR diff --git a/public/OFN.woff b/public/OFN.woff index a8d4905798510ba14307bd91aa37477e6ebd1195..1b1d24bd459c228fbc0a3d65cd3ea33a33d06016 100755 GIT binary patch delta 1470 zcmYLJU2GIp6uz_N!Y!07mJFaEza*BF8Zl8MCMXGs`~+VV5=}7B$cw!sw+7FhwmO;b%)Q^7 z`ObIF%?sOv3d9IWoysz7C5H1FEx zBc$mGChV7B>!+U_=xjSq$o8GMck$Amo94l`6OtQ7j?H4pp^mn8bsv#C#W_7IL($vje%Ogea;+;(Yl( z$B&&ji9VS1=*^X<>B~qzE|&4>3m8cuhUjDosd2)}u_A>jirDweZscJ~go zth0bpcf-`uQ}F>{A^<4$J0DYrz>K4SChPTsVKMD4H7qkX1dPk1XC2Sxsp70iivSN% z-Hw5-pV1*^>x^rniDr|zM9$1X*34!Yzrcs7W5Y+fjhSh^OlMxcieFYiu-n%u-*iV6 z`{1u?3P;qVpET^^dm-{YJ<7+N2W)dSFBSJx=;`h4L4(~ud!Tm&MzQS`6h=ozM$r+n zqcGA7Jq*MOdcskGv-%dA4-^y?DwBDwXmK!hQ{4*(+MyL%^X*^5RhXE-aJ7A+6&M^= z$6>4sj=+(wE)38$2IDY3HZ~5-`)tRLDmLlk0bWII8_wyLZubr1aD-n3g`Wp;FnwuV z*A3{C?FU4a2nZidCQ}KBLn0l|CM_d&ZqT+F_w#b@7v(gQ%%!p*=ab1~Gih7^63Gk` z)BH~r+yh_5)K9W@1+T=~mRsAfV{UCtM6kkO0umBdT#o$>l+C)bIh4)d>}O;XS>}y# z!Mjw*4!T7&9-*iNhU?lw*Ojj83YtjFxHjXNq%?EnB0`(%J#HpYC6Psy*i5gCS79?g5uh_PwvATZvD!?u@X%cEqCvbf zw;qPMl`MQuHS9jX9|JnB6h2-l=Z||`hkiN#TC8slX5$txGfk!YjLGMLs%SmN{n0>a?Txj;_ls-(CW}1ypF+s3OPN!1*XPfl z|K=%F9ywn|w`~l$w`YTbSIobUxQ)0t3)OB~;}ka)Icu7_w_HLpf*3&zBf^L%LO%E( O2x%cCl)u(gt^5n;^*QSR delta 947 zcmYLHZAep57(Vyv)vL8FqgiQE+KSA|q3y#hHmBQkVok^(2%1Y}`?D!H$UnAzB=^qa zy_a$Q5!8<;At7)-rrDQLl+_O*f&!7ggbJaEisA@&W$)drF86s4?|a_odERq46BntB zOqHJXd%gb7PCr7v3@S$O`KAyhm$a8A4;05e%LsXvM+{%P{KsqS5b`cULzfD+D)X^B z66{B)#R_@5in0?6Tqro8)-FKKu47ZUH`oKUQOM0%4Ba$_p$N4{kQ-FweWEqtNNf;l zE0DiX(Opk53z6U;2)5pXLO~X$4ipVWdZ7knO0R;uZ2Z;VHxPs2UnN(ZHYclnW+MYF%~aU}dezc+|L5S6F|@{MtI+ zAla7e)6U(_pmWaoyV21&)Hv%p*R-SQP4jqWOq=^@Wi0(Pe`68#A^lRLF~_I$DSSPO z!#La*4Z#wfz>|1#Vqy}r_>w+=Lm?c%fmCP)-@=nAJcDP#snf8B8SScPUa#1Qh1iLM z5k;KjBwifG9LFkF#jaS1o#CWm%<~+Fhee(xcEzFC6bqBfB`%4@xX6+QVkQlWnGyLU zmZY2zt0mu7%Rydo5S1c<1P4kWFS3dY3`c~7fJH2f3WC5A7jZM91bkkEPM!z81^B@I zZ>jD<2RN#Hl?VP@)8R(xtPRgLf~-% zCq@zpR&gsXhU0+fI$mewt4t9P1~KeskhM%n07W6XEh&@y*7FQ7Z}6K$a3nIZJ-hV9PZb!~0!EnP&t rlNWroT2pp=Jy3FG+tr$Bpd15S0bB#LuLHsQ4+wQ2WJ-T&vr&Hlr{`D5 From a7a8c3ecee14d6d4e613bd159ebade0b2c109597 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:30:52 +1000 Subject: [PATCH 23/73] Change icon for bullet point for list style --- app/assets/stylesheets/darkswarm/typography.css.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass index aad9fa7237..8359419d54 100644 --- a/app/assets/stylesheets/darkswarm/typography.css.sass +++ b/app/assets/stylesheets/darkswarm/typography.css.sass @@ -43,7 +43,7 @@ ul.ofn-list line-height: 1.5 height: inherit li:before - content: "\e627" + content: "\e62d" font-family: "OFN" display: inline-block font-weight: normal From 4893679d120c3ff9d0aaa2dd9a91411216a99dbc Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:48:32 +1000 Subject: [PATCH 24/73] Adding in icons to checkout partial --- app/views/checkout/_billing.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/checkout/_billing.html.haml b/app/views/checkout/_billing.html.haml index dc48eadbe2..d1a0e589f0 100644 --- a/app/views/checkout/_billing.html.haml +++ b/app/views/checkout/_billing.html.haml @@ -4,9 +4,9 @@ %h5{"ng-class" => "{valid: billing.$valid, dirty: details.$dirty}"} %span.right %label.label.round.alert - %i.fi-x + %i.ofn-i_009-close %label.label.round.success - %i.fi-check + %i.ofn-i_051-check-big Billing info %accordion-group{"is-open" => "accordion.billing", @@ -19,9 +19,9 @@ {{ summary() | printArray }} .small-1.columns.right %span.accordion-up.right - %i.fi-arrow-up + %i.ofn-i_006-caret-up %span.accordion-down.right - %i.fi-arrow-down + %i.ofn-i_005-caret-down = f.fields_for :bill_address, @order.bill_address do |ba| .row From b4f14197fae4b34d80fcc1be7ef5d0e4828d097c Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:48:47 +1000 Subject: [PATCH 25/73] Adding in icons to checkout partial --- app/views/checkout/_details.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/checkout/_details.html.haml b/app/views/checkout/_details.html.haml index 76c5c32398..a4c43e57ac 100644 --- a/app/views/checkout/_details.html.haml +++ b/app/views/checkout/_details.html.haml @@ -4,9 +4,9 @@ %h5{"ng-class" => "{valid: details.$valid, dirty: details.$dirty}"} %span.right %label.label.round.alert - %i.fi-x + %i.ofn-i_009-close %label.label.round.success - %i.fi-check + %i.ofn-i_051-check-big Your details %accordion-group{"is-open" => "accordion.details", @@ -19,9 +19,9 @@ {{ summary() | printArray }} .small-1.columns.right %span.accordion-up.right - %i.fi-arrow-up + %i.ofn-i_006-caret-up %span.accordion-down.right - %i.fi-arrow-down + %i.ofn-i_005-caret-down .row .small-6.columns From cbc28f6da75389b318e505a86cebac78668d29b6 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:48:59 +1000 Subject: [PATCH 26/73] Adding in icons to checkout partial --- app/views/checkout/_payment.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/checkout/_payment.html.haml b/app/views/checkout/_payment.html.haml index 195ae9e42a..bfeb099354 100644 --- a/app/views/checkout/_payment.html.haml +++ b/app/views/checkout/_payment.html.haml @@ -4,9 +4,9 @@ %h5{"ng-class" => "{valid: payment.$valid, dirty: details.$dirty}"} %span.right %label.label.round.alert - %i.fi-x + %i.ofn-i_009-close %label.label.round.success - %i.fi-check + %i.ofn-i_051-check-big Payment %accordion-group{"is-open" => "accordion.payment", @@ -19,9 +19,9 @@ {{ Order.paymentMethod().name }} .small-1.columns.right %span.accordion-up.right - %i.fi-arrow-up + %i.ofn-i_006-caret-up %span.accordion-down.right - %i.fi-arrow-down + %i.ofn-i_005-caret-down - current_order.available_payment_methods.each do |method| .row From cca6a39476f688acbc81b8e5c4a71a66aecd667f Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:49:14 +1000 Subject: [PATCH 27/73] Adding in icons to checkout partial --- app/views/checkout/_shipping.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/checkout/_shipping.html.haml b/app/views/checkout/_shipping.html.haml index dfa69d43c5..800aea78a0 100644 --- a/app/views/checkout/_shipping.html.haml +++ b/app/views/checkout/_shipping.html.haml @@ -4,9 +4,9 @@ %h5{"ng-class" => "{valid: shipping.$valid, dirty: details.$dirty}"} %span.right %label.label.round.alert - %i.fi-x + %i.ofn-i_009-close %label.label.round.success - %i.fi-check + %i.ofn-i_051-check-big Shipping info %accordion-group{"is-open" => "accordion.shipping", @@ -19,9 +19,9 @@ {{ Order.shippingMethod().name }} .small-1.columns.right %span.accordion-up.right - %i.fi-arrow-up + %i.ofn-i_006-caret-up %span.accordion-down.right - %i.fi-arrow-down + %i.ofn-i_005-caret-down - for ship_method, i in current_distributor.shipping_methods.uniq .row From e064aa3173d455ac1be89264768ccfcb391f15a7 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:49:32 +1000 Subject: [PATCH 28/73] Restyling labels for new icons in checkout process --- app/assets/stylesheets/darkswarm/checkout.css.sass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/darkswarm/checkout.css.sass b/app/assets/stylesheets/darkswarm/checkout.css.sass index 64a7e2bd00..9caf28ae43 100644 --- a/app/assets/stylesheets/darkswarm/checkout.css.sass +++ b/app/assets/stylesheets/darkswarm/checkout.css.sass @@ -20,6 +20,10 @@ checkout padding: 0.65em background: #f7f7f7 + .label + font-size: 1em + padding: 0.3rem 0.35rem 0.275rem + // Logic to turn on & off the alerts for success against each fieldset label, label.alert, label.success, &.valid label.alert, &.dirty label.success From 474581211ba93c6c1f9d21ac0a31236b29653347 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:56:41 +1000 Subject: [PATCH 29/73] Add class right to icons --- app/views/checkout/_billing.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/checkout/_billing.html.haml b/app/views/checkout/_billing.html.haml index d1a0e589f0..6ab949e36e 100644 --- a/app/views/checkout/_billing.html.haml +++ b/app/views/checkout/_billing.html.haml @@ -3,9 +3,9 @@ %h5{"ng-class" => "{valid: billing.$valid, dirty: details.$dirty}"} %span.right - %label.label.round.alert + %label.label.round.alert.right %i.ofn-i_009-close - %label.label.round.success + %label.label.round.success.right %i.ofn-i_051-check-big Billing info From 34c4fc8aa1f00b1da3732fe8f8f02571c0f0dd20 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:56:52 +1000 Subject: [PATCH 30/73] Add class right to icons --- app/views/checkout/_details.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/checkout/_details.html.haml b/app/views/checkout/_details.html.haml index a4c43e57ac..5be6b84043 100644 --- a/app/views/checkout/_details.html.haml +++ b/app/views/checkout/_details.html.haml @@ -3,9 +3,9 @@ %h5{"ng-class" => "{valid: details.$valid, dirty: details.$dirty}"} %span.right - %label.label.round.alert + %label.label.round.alert.right %i.ofn-i_009-close - %label.label.round.success + %label.label.round.success.right %i.ofn-i_051-check-big Your details From 9cae581cda109bb1c5986d1c958b420efc2da005 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:57:06 +1000 Subject: [PATCH 31/73] Add class right to icons --- app/views/checkout/_payment.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/checkout/_payment.html.haml b/app/views/checkout/_payment.html.haml index bfeb099354..39b40675bf 100644 --- a/app/views/checkout/_payment.html.haml +++ b/app/views/checkout/_payment.html.haml @@ -3,9 +3,9 @@ %h5{"ng-class" => "{valid: payment.$valid, dirty: details.$dirty}"} %span.right - %label.label.round.alert + %label.label.round.alert.right %i.ofn-i_009-close - %label.label.round.success + %label.label.round.success.right %i.ofn-i_051-check-big Payment From 3fca8640fde402ac20abe4344afada6bfe755681 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 11:57:19 +1000 Subject: [PATCH 32/73] Add class right to icons --- app/views/checkout/_shipping.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/checkout/_shipping.html.haml b/app/views/checkout/_shipping.html.haml index 800aea78a0..3712b995ac 100644 --- a/app/views/checkout/_shipping.html.haml +++ b/app/views/checkout/_shipping.html.haml @@ -3,9 +3,9 @@ %h5{"ng-class" => "{valid: shipping.$valid, dirty: details.$dirty}"} %span.right - %label.label.round.alert + %label.label.round.alert.right %i.ofn-i_009-close - %label.label.round.success + %label.label.round.success.right %i.ofn-i_051-check-big Shipping info From 43cc77c88b901e29ff55295b58d3c38dd6f95a52 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 12:01:57 +1000 Subject: [PATCH 33/73] Adding icon into button --- app/views/checkout/_summary.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/checkout/_summary.html.haml b/app/views/checkout/_summary.html.haml index 06edeac8b5..c943964a9f 100644 --- a/app/views/checkout/_summary.html.haml +++ b/app/views/checkout/_summary.html.haml @@ -25,6 +25,6 @@ //= f.submit "Purchase", class: "button", "ng-disabled" => "checkout.$invalid", "ofn-focus" => "accordion['payment']" %a.button.secondary{href: cart_url} - %i.fi-arrow-left + %i.ofn-i_008-caret-left Back to Cart From 10418b6035dc554ba9fa46024e1a61b7b2a1b98a Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 12:17:44 +1000 Subject: [PATCH 34/73] Merge issues. Removing position fixed on modal window styling. --- app/assets/stylesheets/darkswarm/overrides.css.sass | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/overrides.css.sass b/app/assets/stylesheets/darkswarm/overrides.css.sass index 917d6dd2e3..fcec6b455d 100644 --- a/app/assets/stylesheets/darkswarm/overrides.css.sass +++ b/app/assets/stylesheets/darkswarm/overrides.css.sass @@ -1,5 +1,2 @@ .row max-width: 74em - -.reveal-modal - position: fixed From 589188d21ef1b5900f7eeacfb1239232665b9fdb Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 12:32:28 +1000 Subject: [PATCH 35/73] Update icons for Tabs on hub shopping page --- app/assets/stylesheets/darkswarm/tabs.css.sass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/tabs.css.sass b/app/assets/stylesheets/darkswarm/tabs.css.sass index 303e8515ff..4bfd2935f4 100644 --- a/app/assets/stylesheets/darkswarm/tabs.css.sass +++ b/app/assets/stylesheets/darkswarm/tabs.css.sass @@ -33,9 +33,12 @@ border-top: 4px solid transparent a:after padding-left: 8px - content: "\f109" + content: "\e632" visibility: hidden @include icon-font + dd:hover + a:after + visibility: visible // active nav link @@ -45,7 +48,7 @@ a color: $clr-brick-bright a:after - content: "\f10c" + content: "\e631" visibility: visible @include icon-font From 5a7df20a2e4f63c9dfdf41158084185c9e039764 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 12:32:46 +1000 Subject: [PATCH 36/73] Update icon font for mixins --- app/assets/stylesheets/darkswarm/mixins.sass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass index aa44d4c4b5..a9894a5b10 100644 --- a/app/assets/stylesheets/darkswarm/mixins.sass +++ b/app/assets/stylesheets/darkswarm/mixins.sass @@ -54,13 +54,12 @@ // Assign content: "string" @mixin icon-font - font-family: "foundation-icons" + font-family: "OFN" display: inline-block font-weight: normal font-style: normal font-variant: normal text-transform: none - font-size: 80% // Background options \\ From 9a962f7445ba00e6a86f5d756dedd902233971e1 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 12:35:54 +1000 Subject: [PATCH 37/73] Add new icons to checkout & back to cart buttons --- app/views/spree/orders/edit.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml index f0c6b95a78..76b22aeb36 100644 --- a/app/views/spree/orders/edit.html.haml +++ b/app/views/spree/orders/edit.html.haml @@ -30,12 +30,12 @@ .columns.large-8{"data-hook" => ""} %a.button.large.secondary{href: main_app.shop_path} - %i.fi-arrow-left + %i.ofn-i_008-caret-left Continue shopping .columns.large-4.text-right %a#checkout-link.button.large.primary{href: main_app.checkout_path} Checkout - %i.fi-arrow-right + %i.ofn-i_007-caret-right = render partial: "shared/footer" From a54b3f784915191e636080b102b934ff380734e8 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 12:39:44 +1000 Subject: [PATCH 38/73] Adding new icon for refresh --- app/views/spree/orders/_form.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml index bec495a458..70599a124e 100644 --- a/app/views/spree/orders/_form.html.haml +++ b/app/views/spree/orders/_form.html.haml @@ -32,7 +32,7 @@ %td %td = button_tag :class => 'neutral-btn dark expand small', :id => 'update-button' do - %i.fi-refresh + %i.ofn-i_023-refresh = t(:update) %td %h5.order-total.grand-total= @order.display_total From 00ac80bdbbcac6c942005822d4e8c6605213fe6e Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 12:56:56 +1000 Subject: [PATCH 39/73] Add new icons --- app/views/spree/orders/_form.html.haml | 2 +- app/views/spree/orders/_line_item.html.haml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml index 70599a124e..214823d4cf 100644 --- a/app/views/spree/orders/_form.html.haml +++ b/app/views/spree/orders/_form.html.haml @@ -31,7 +31,7 @@ %span.order-total.distribution-total= order_distribution_subtotal(@order) %td %td - = button_tag :class => 'neutral-btn dark expand small', :id => 'update-button' do + = button_tag :class => 'secondary radius expand small', :id => 'update-button' do %i.ofn-i_023-refresh = t(:update) %td diff --git a/app/views/spree/orders/_line_item.html.haml b/app/views/spree/orders/_line_item.html.haml index 6986caf100..42649c8bee 100644 --- a/app/views/spree/orders/_line_item.html.haml +++ b/app/views/spree/orders/_line_item.html.haml @@ -23,5 +23,5 @@ %td.cart-item-delete.text-center{"data-hook" => "cart_item_delete"} {{ quantity }} - = link_to image_tag('icons/delete.png'), '#', :class => 'delete', - :id => "delete_#{dom_id(line_item)}" + %a.delete{href: "#", id: "delete_#{dom_id(line_item)}"} + %i.delete.ofn-i_026-trash From 2c334a01808514b1dd7b8702e8de6301bbffffe5 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 13:02:34 +1000 Subject: [PATCH 40/73] Styling for trash icon on checkout page --- app/assets/stylesheets/darkswarm/shopping-cart.css.sass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/darkswarm/shopping-cart.css.sass b/app/assets/stylesheets/darkswarm/shopping-cart.css.sass index a5314c3ef2..4bbd6a9a01 100644 --- a/app/assets/stylesheets/darkswarm/shopping-cart.css.sass +++ b/app/assets/stylesheets/darkswarm/shopping-cart.css.sass @@ -1,6 +1,11 @@ @import mixins @import branding +#cart-detail + .cart-item-delete + a.delete + font-size: 1.125em + #edit-cart button, .button margin: 0 From 179d9f609c26bd4d0006b638e65cb49450f72dc9 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 13:05:56 +1000 Subject: [PATCH 41/73] Adding in new lock icon to signed in --- app/views/shared/_signed_out.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_signed_out.html.haml b/app/views/shared/_signed_out.html.haml index f7442b13ff..cf5492487a 100644 --- a/app/views/shared/_signed_out.html.haml +++ b/app/views/shared/_signed_out.html.haml @@ -1,5 +1,5 @@ %li#login-link{"ng-controller" => "AuthenticationCtrl"} %a{"ng-click" => "open()"} - %i.fi-lock + %i.ofn-i_017-locked LOG IN From 49a39bb2407f4cdf48328d920a34e669bb1a238a Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 13:06:48 +1000 Subject: [PATCH 42/73] Adding unlock icon to signed in --- app/views/shared/_signed_in.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/shared/_signed_in.html.haml b/app/views/shared/_signed_in.html.haml index 1ac376879b..2e5dfc5b81 100644 --- a/app/views/shared/_signed_in.html.haml +++ b/app/views/shared/_signed_in.html.haml @@ -3,4 +3,5 @@ = spree_current_user.email %li.divider %li#sign-out-link + %i.ofn-i_018-unlocked = link_to "Sign Out", "/logout" \ No newline at end of file From 42a9f1680052ceb928d6a0e816bf10dd7a3eb917 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 13:08:18 +1000 Subject: [PATCH 43/73] Adding in new icon into producer partial --- app/views/producers/_fat.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/producers/_fat.html.haml b/app/views/producers/_fat.html.haml index 3313db6552..128795a9ba 100644 --- a/app/views/producers/_fat.html.haml +++ b/app/views/producers/_fat.html.haml @@ -15,4 +15,4 @@ .columns.small-1.text-right %a{"bo-href" => "hub.path"} - %i.fi-arrow-right + %i.ofn-i_007-caret-right From 5bdb38e293bf3ab06b12967d4d793055e9e21327 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 12:17:44 +1000 Subject: [PATCH 44/73] Merge issues. Removing position fixed on modal window styling. --- app/assets/stylesheets/darkswarm/overrides.css.sass | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/overrides.css.sass b/app/assets/stylesheets/darkswarm/overrides.css.sass index 917d6dd2e3..fcec6b455d 100644 --- a/app/assets/stylesheets/darkswarm/overrides.css.sass +++ b/app/assets/stylesheets/darkswarm/overrides.css.sass @@ -1,5 +1,2 @@ .row max-width: 74em - -.reveal-modal - position: fixed From 72c50486faa9548390b1b9d872868ea5a3b60dd3 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 14:29:08 +1000 Subject: [PATCH 45/73] ADding new icons into producer modal --- app/views/modals/_producer.html.haml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml index 13f8026195..58d661d8b5 100644 --- a/app/views/modals/_producer.html.haml +++ b/app/views/modals/_producer.html.haml @@ -12,27 +12,32 @@ %ul.small-block-grid-1{bindonce: true} %li{"ng-if" => "producer.website"} %a{"ng-href" => "http://{{producer.website | stripUrl}}", target: "_blank" } - %i.fi-web + %i.ofn-i_049-web {{ producer.website | stripUrl }} + %li{"ng-if" => "producer.email"} + %a{"ng-href" => "mailto:{{producer.email | stripUrl}}", target: "_blank" } + %i.ofn-i_050-mail-circle + {{ producer.email | stripUrl }} + %li{"ng-if" => "producer.twitter"} %a{"ng-href" => "http://twitter.com/{{producer.twitter}}", target: "_blank"} - %i.fi-social-twitter + %i.ofn-i_041-twitter {{ producer.twitter }} %li{"ng-if" => "producer.facebook"} %a{"ng-href" => "http://{{producer.facebook | stripUrl}}", target: "_blank"} - %i.fi-social-facebook + %i.ofn-i_044-facebook {{ producer.facebook | stripUrl }} %li{"ng-if" => "producer.linkedin"} %a{"ng-href" => "http://{{producer.linkedin | stripUrl}}", target: "_blank"} - %i.fi-social-linkedin + %i.ofn-i_042-linkedin {{ producer.linkedin | stripUrl }} %li{"ng-if" => "producer.instagram"} %a{"ng-href" => "http://instagram.com/{{producer.instagram}}", target: "_blank"} - %i.fi-social-instagram + %i.ofn-i_043-instagram {{ producer.instagram }} From 31ae0cf2a9cecbda09af1f22f6d492ea80e630da Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 16:14:40 +1000 Subject: [PATCH 46/73] Tweak logic on contact us address line display --- app/views/shopping_shared/_contact.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shopping_shared/_contact.html.haml b/app/views/shopping_shared/_contact.html.haml index d4894357ad..ab4d98a952 100644 --- a/app/views/shopping_shared/_contact.html.haml +++ b/app/views/shopping_shared/_contact.html.haml @@ -7,7 +7,7 @@ %h4=current_distributor.name %p = current_distributor.address.address1 - - if current_distributor.address.address2 + - unless current_distributor.address.address2.blank? %br = current_distributor.address.address2 %br From b19ca3b9c489b8cf44d3767b7c8ba5f0b392d771 Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 16:38:27 +1000 Subject: [PATCH 47/73] Remove whitespace --- app/assets/stylesheets/darkswarm/typography.css.sass | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass index 69d16aef9e..9e5f80f585 100644 --- a/app/assets/stylesheets/darkswarm/typography.css.sass +++ b/app/assets/stylesheets/darkswarm/typography.css.sass @@ -70,7 +70,6 @@ table tr th, table tr td table thead tr th, table thead tr td, table tfoot tr th, table tfoot tr td color: #333333 - span.email direction: rtl unicode-bidi: bidi-override From ef5b36cddd3dd8275dab242bbd5edff8f2e923bc Mon Sep 17 00:00:00 2001 From: summerscope Date: Fri, 30 May 2014 16:39:07 +1000 Subject: [PATCH 48/73] Styling producers --- .../stylesheets/darkswarm/images.css.sass | 1 + .../stylesheets/darkswarm/producers.css.sass | 2 +- app/views/modals/_producer.html.haml | 19 +++++++------------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/images.css.sass b/app/assets/stylesheets/darkswarm/images.css.sass index 927e906842..90207a2239 100644 --- a/app/assets/stylesheets/darkswarm/images.css.sass +++ b/app/assets/stylesheets/darkswarm/images.css.sass @@ -17,6 +17,7 @@ .producer-hero-img background-color: #999 width: 100% + min-height: 160px height: inherit max-height: 260px overflow: hidden diff --git a/app/assets/stylesheets/darkswarm/producers.css.sass b/app/assets/stylesheets/darkswarm/producers.css.sass index 96a42a3a6b..3ad4e7de3a 100644 --- a/app/assets/stylesheets/darkswarm/producers.css.sass +++ b/app/assets/stylesheets/darkswarm/producers.css.sass @@ -4,4 +4,4 @@ .producers @include fullwidthbg background-image: url("/assets/producers/producers-pg-bg.jpg") - background-repeat: no-repeat + background-repeat: no-repeat \ No newline at end of file diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml index 13f8026195..a4dc687eee 100644 --- a/app/views/modals/_producer.html.haml +++ b/app/views/modals/_producer.html.haml @@ -1,39 +1,34 @@ %ofn-modal{title: "{{producer.name}}"} .row - .columns.small-12.producer-hero - %img.producer-hero-img{"ng-src" => "{{producer.promo_image}}"} - / Will - scale large images down to 1200px wide, crop in to img aspect ratio 60W:13H + .small-12.columns.producer-hero %h3.producer-name {{ producer.name }} + %img.producer-hero-img{"ng-src" => "{{producer.promo_image}}"} + .row - .columns.small-12.large-6{"ng-bind-html" => "producer.long_description"} - .columns.small-12.large-6 + .small-12.large-6.columns + %p{"ng-bind-html" => "producer.long_description"} + .small-12.large-6.columns %img.producer-logo{"ng-src" => "{{producer.logo}}", "ng-if" => "producer.logo"} - %h4 Stay in touch with {{ producer.name }} + %h5 Stay in touch with {{ producer.name }} %ul.small-block-grid-1{bindonce: true} %li{"ng-if" => "producer.website"} %a{"ng-href" => "http://{{producer.website | stripUrl}}", target: "_blank" } %i.fi-web {{ producer.website | stripUrl }} - %li{"ng-if" => "producer.twitter"} %a{"ng-href" => "http://twitter.com/{{producer.twitter}}", target: "_blank"} %i.fi-social-twitter {{ producer.twitter }} - %li{"ng-if" => "producer.facebook"} %a{"ng-href" => "http://{{producer.facebook | stripUrl}}", target: "_blank"} %i.fi-social-facebook {{ producer.facebook | stripUrl }} - %li{"ng-if" => "producer.linkedin"} %a{"ng-href" => "http://{{producer.linkedin | stripUrl}}", target: "_blank"} %i.fi-social-linkedin {{ producer.linkedin | stripUrl }} - %li{"ng-if" => "producer.instagram"} %a{"ng-href" => "http://instagram.com/{{producer.instagram}}", target: "_blank"} %i.fi-social-instagram {{ producer.instagram }} - - %a.close-reveal-modal{"ng-click" => "$close()"} × From 8a3416071313974d573677f22951decc7fa94192 Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:18:43 +1000 Subject: [PATCH 49/73] No change --- app/views/layouts/_become_distributor.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_become_distributor.html.haml b/app/views/layouts/_become_distributor.html.haml index 79d3b4a0db..6d67ee9306 100644 --- a/app/views/layouts/_become_distributor.html.haml +++ b/app/views/layouts/_become_distributor.html.haml @@ -14,4 +14,4 @@ = text_area_tag :email_body, "", :input_html => { :rows => 10 } = submit_tag "Submit", class: "button" - = link_to "×".html_safe, "#", class: "close-reveal-modal" + = link_to "×".html_safe, "#", class: "close-reveal-modal" \ No newline at end of file From cd332c1eb1c72af9277f1aeea9d6ab6002d579ee Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:19:22 +1000 Subject: [PATCH 50/73] Implementing new X icon for modal window --- app/views/modals/_food_hub.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_food_hub.html.haml b/app/views/modals/_food_hub.html.haml index da3fe0bdda..ba0864b284 100644 --- a/app/views/modals/_food_hub.html.haml +++ b/app/views/modals/_food_hub.html.haml @@ -4,4 +4,5 @@ %h5 Our food hubs are the point of contact between you and the people who make your food! %p You can search for a convenient hub by location or name. Some hubs have multiple points where you can pick-up your purchases, and some will also provide delivery options. Each food hub is a sales point with independent business operations and logistics - so variations between hubs are to be expected. %p You can only shop at one food hub at a time. -%a.close-reveal-modal{"ng-click" => "$close()"} × +%a.close-reveal-modal{"ng-click" => "$close()"} + %i.ofn-i_009-close From d160f4fe51bc3dc2c02581ee722d43c501b528f7 Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:19:37 +1000 Subject: [PATCH 51/73] Implementing new X icon for modal window --- app/views/modals/_groups.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_groups.html.haml b/app/views/modals/_groups.html.haml index a97b9982c7..43be03bcc9 100644 --- a/app/views/modals/_groups.html.haml +++ b/app/views/modals/_groups.html.haml @@ -3,4 +3,5 @@ Groups / Regions %p These are the organisations and relationships between hubs which make up the Open Food Network. %p Some groups are clustered by location or council, others by non-geographic similarities. -%a.close-reveal-modal{"ng-click" => "cancel()"} × \ No newline at end of file +%a.close-reveal-modal{"ng-click" => "$close()"} + %i.ofn-i_009-close \ No newline at end of file From 73a68799be04ba4511e01af2509c664778d7055e Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:19:45 +1000 Subject: [PATCH 52/73] Implementing new X icon for modal window --- app/views/modals/_learn_more.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_learn_more.html.haml b/app/views/modals/_learn_more.html.haml index 4cb0534c6e..58a1bf260d 100644 --- a/app/views/modals/_learn_more.html.haml +++ b/app/views/modals/_learn_more.html.haml @@ -6,4 +6,5 @@ %h5 Learn more %p If you want to learn more about the Open Food Network, how it works, and get involved, check out: %a.button.neutral-btn.dark{:href => "http://www.openfoodnetwork.org" , :target => "_blank" } Open Food Network -%a.close-reveal-modal{"ng-click" => "$close()"} × +%a.close-reveal-modal{"ng-click" => "$close()"} + %i.ofn-i_009-close From c07ca67f29ebd450fd97ef696f9e4add732aa980 Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:19:56 +1000 Subject: [PATCH 53/73] Implementing new X icon for modal window --- app/views/modals/_producer.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml index 0f2bfd5c99..4b4421e8d8 100644 --- a/app/views/modals/_producer.html.haml +++ b/app/views/modals/_producer.html.haml @@ -43,4 +43,5 @@ %i.ofn-i_043-instagram {{ producer.instagram }} - %a.close-reveal-modal{"ng-click" => "$close()"} × + %a.close-reveal-modal{"ng-click" => "$close()"} + %i.ofn-i_009-close From 653120888f43b41645e8d74e27298fc573498dc2 Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:20:03 +1000 Subject: [PATCH 54/73] Implementing new X icon for modal window --- app/views/modals/_producers.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_producers.html.haml b/app/views/modals/_producers.html.haml index d3be6e56c3..069ec9e3b6 100644 --- a/app/views/modals/_producers.html.haml +++ b/app/views/modals/_producers.html.haml @@ -2,4 +2,5 @@ %i.ofn-i_036-producers Producers %p Our producers make all the delicious food you can shop for on the Open Food Network. -%a.close-reveal-modal{"ng-click" => "cancel()"} × \ No newline at end of file +%a.close-reveal-modal{"ng-click" => "$close()"} + %i.ofn-i_009-close \ No newline at end of file From 31bab3469e052ed2ee3b7f038136f2860063739b Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:20:15 +1000 Subject: [PATCH 55/73] Implementing new X icon for modal window --- app/views/modals/_product.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_product.html.haml b/app/views/modals/_product.html.haml index 9c071b51eb..b2281d64ca 100644 --- a/app/views/modals/_product.html.haml +++ b/app/views/modals/_product.html.haml @@ -7,4 +7,5 @@ %img{"ng-src" => "{{product.primary_taxon.icon}}"} {{product.name}} %p {{product.description}} - %a.close-reveal-modal{"ng-click" => "$close()"} × + %a.close-reveal-modal{"ng-click" => "$close()"} + %i.ofn-i_009-close From a6a86612c75a7a1d1cc41fa9cd5e9afe9a523292 Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:48:11 +1000 Subject: [PATCH 56/73] Adding X from new icon font to modal --- app/assets/javascripts/templates/authentication.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/templates/authentication.html.haml b/app/assets/javascripts/templates/authentication.html.haml index ab388a691e..3f219240e6 100644 --- a/app/assets/javascripts/templates/authentication.html.haml +++ b/app/assets/javascripts/templates/authentication.html.haml @@ -3,4 +3,5 @@ %ng-include{src: "'login.html'"} %ng-include{src: "'signup.html'"} %ng-include{src: "'forgot.html'"} -%a.close-reveal-modal{"ng-click" => "$close()"} × +%a.close-reveal-modal{"ng-click" => "$close()"} + %i.ofn-i_009-close \ No newline at end of file From 037769bfb183bf6f003fa1a7e2a92f1656ae636a Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:50:17 +1000 Subject: [PATCH 57/73] Adding new icons from icon font --- app/views/shopping_shared/_contact.html.haml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/shopping_shared/_contact.html.haml b/app/views/shopping_shared/_contact.html.haml index ab4d98a952..89eff0a723 100644 --- a/app/views/shopping_shared/_contact.html.haml +++ b/app/views/shopping_shared/_contact.html.haml @@ -20,36 +20,36 @@ - unless current_distributor.website.blank? %li %a{href: current_distributor.website, target: "_blank" } - %i.fi-web + %i.ofn-i_049-web = current_distributor.website - unless current_distributor.email.blank? %li %a{href: current_distributor.email.reverse, mailto: true } - %i.fi-mail + %i.ofn-i_050-mail-circle %span.email = current_distributor.email.reverse - unless current_distributor.twitter.blank? %li %a{href: current_distributor.twitter, target: "_blank" } - %i.fi-social-twitter + %i.ofn-i_041-twitter = current_distributor.twitter - unless current_distributor.facebook.blank? %li %a{href: current_distributor.facebook, target: "_blank" } - %i.fi-social-facebook + %i.ofn-i_044-facebook = current_distributor.facebook - unless current_distributor.linkedin.blank? %li %a{href: current_distributor.linkedin, target: "_blank" } - %i.fi-social-linkedin + %i.ofn-i_042-linkedin = current_distributor.linkedin - unless current_distributor.instagram.blank? %li %a{href: current_distributor.instagram, target: "_blank" } - %i.fi-social-instagram + %i.ofn-i_043-instagram = current_distributor.instagram From fc4e20ffd49d6cd20d771ba710b6833ec830c20e Mon Sep 17 00:00:00 2001 From: summerscope Date: Tue, 3 Jun 2014 11:50:38 +1000 Subject: [PATCH 58/73] Adding new icons from new pretty icon font --- app/views/shared/menu/_cart.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/menu/_cart.html.haml b/app/views/shared/menu/_cart.html.haml index d2854affb5..e34c17c559 100644 --- a/app/views/shared/menu/_cart.html.haml +++ b/app/views/shared/menu/_cart.html.haml @@ -1,5 +1,5 @@ %a.icon{href: cart_url, "ng-controller" => "CartCtrl"} - %i.fi-shopping-cart.nav-branded + %i.ofn-i_027-shopping-cart.nav-branded %span {{ CurrentOrder.cart_count }} items From 77f847dcbeda87eead6b537d612ca2bb2488c857 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:06:24 +1000 Subject: [PATCH 59/73] Adding in new icon fonts to menu system. Adding drop down cog to simplify top menu. --- .../stylesheets/darkswarm/menu.css.sass | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/menu.css.sass b/app/assets/stylesheets/darkswarm/menu.css.sass index 735a19e97b..54807e3977 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.sass +++ b/app/assets/stylesheets/darkswarm/menu.css.sass @@ -1,11 +1,25 @@ @import branding @import mixins -.top-bar + +.fixed .top-bar @include box-shadow(0 2px 3px 0 rgba(0,0,0,0.25)) nav @include textpress + + // Default overrides - big menu + + .top-bar-section .has-dropdown > a + padding-right: 15px !important + + i.ofn-i_022-cog + font-size: 24px + line-height: 45px + + .top-bar-section .has-dropdown > a:after + display: none + .top-bar-section ul li > a font-size: 0.75rem height: 45px @@ -13,16 +27,40 @@ nav opacity: 0.8 &:hover, &:focus, &:active opacity: 1 + .nav-branded color: $clr-brick-light-bright + span + font-size: 13px .nav-primary @include avenir font-size: 0.875rem -nav.top-bar a.icon i - font-size: 22px + +// Mobile Menu + +.off-canvas-wrap.move-right .tab-bar .menu-icon + @include box-shadow(inset 0 0 6px 2px rgba(0,0,0,0.5)) + +.off-canvas-wrap .tab-bar .menu-icon + @include csstrans + @include box-shadow(none) + +.off-canvas-wrap.move-right .tab-bar .menu-icon span + -moz-box-shadow: 0 0px 0 1px #666, 0 7px 0 1px #666, 0 14px 0 1px #666 + -webkit-box-shadow: 0 0px 0 1px #666, 0 7px 0 1px #666, 0 14px 0 1px #666 + box-shadow: 0 0px 0 1px #666, 0 7px 0 1px #666, 0 14px 0 1px #666 + +.off-canvas-wrap.move-right ul.off-canvas-list + font-size: 0.875rem + +.off-canvas-wrap.move-right ul.off-canvas-list i + font-size: 1.5rem + margin-right: 0.25rem + // Responsive + @media screen and (min-width: 1025px) body.off-canvas // padding required to placehold for fixed menu bar From 1e3c046368114e38c05ee9d8cbc859952c9f99e0 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:07:02 +1000 Subject: [PATCH 60/73] Adding in new icon fonts to signed in partial --- app/views/shared/_signed_in.html.haml | 34 +++++++++++++++++++++------ 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/app/views/shared/_signed_in.html.haml b/app/views/shared/_signed_in.html.haml index 2e5dfc5b81..967986f4f1 100644 --- a/app/views/shared/_signed_in.html.haml +++ b/app/views/shared/_signed_in.html.haml @@ -1,7 +1,27 @@ -%li#login-name - %a{"ng-click" => "toggle('/account')"} - = spree_current_user.email -%li.divider - %li#sign-out-link - %i.ofn-i_018-unlocked - = link_to "Sign Out", "/logout" \ No newline at end of file +/ %li#login-name +/ %a{"ng-click" => "toggle('/account')"} +/ = spree_current_user.email +/ %li#sign-out-link +/ %a{title: 'Log Out', href:'/logout' } +/ %i.ofn-i_018-unlocked +/ LOG OUT +/ = link_to "Sign Out", "/logout" +/ %li.divider +%li.has-dropdown.not-click + %a{href: "#"} + %i.ofn-i_022-cog + %ul.dropdown + %li + %a{href: spree.account_path} + %i.ofn-i_015-user + = spree_current_user.email + %li + %a{title: 'Log Out', href:'/logout' } + %i.ofn-i_018-unlocked + LOG OUT + + - if admin_user? or enterprise_user? + %li + %a{href: spree.admin_path} + %i.ofn-i_021-tools + Admin \ No newline at end of file From 6e4de586a908966b8aad6190f079784d6d0a9057 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:07:17 +1000 Subject: [PATCH 61/73] Adding in new icon fonts to signed out partial --- app/views/shared/_signed_out.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_signed_out.html.haml b/app/views/shared/_signed_out.html.haml index cf5492487a..a004344038 100644 --- a/app/views/shared/_signed_out.html.haml +++ b/app/views/shared/_signed_out.html.haml @@ -1,5 +1,5 @@ %li#login-link{"ng-controller" => "AuthenticationCtrl"} %a{"ng-click" => "open()"} %i.ofn-i_017-locked - LOG IN + %span LOG IN From 498559f70d54793536cc01f66c160222b8d24a97 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:07:41 +1000 Subject: [PATCH 62/73] Adding in new icon fonts to cart partial --- app/views/shared/menu/_cart.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/shared/menu/_cart.html.haml b/app/views/shared/menu/_cart.html.haml index e34c17c559..a7320554c6 100644 --- a/app/views/shared/menu/_cart.html.haml +++ b/app/views/shared/menu/_cart.html.haml @@ -1,5 +1,6 @@ %a.icon{href: cart_url, "ng-controller" => "CartCtrl"} - %i.ofn-i_027-shopping-cart.nav-branded + %span.nav-branded + %i.ofn-i_027-shopping-cart %span {{ CurrentOrder.cart_count }} items From 122ab01ce40e4395e65245939ec8b36ca52d7b05 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:08:02 +1000 Subject: [PATCH 63/73] Adding in new icon fonts to large menu partial --- app/views/shared/menu/_large_menu.html.haml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml index 945e28027b..4a81964211 100644 --- a/app/views/shared/menu/_large_menu.html.haml +++ b/app/views/shared/menu/_large_menu.html.haml @@ -1,7 +1,7 @@ -%nav.top-bar.show-for-large-up{'data' => 'topbar'} +%nav.top-bar.show-for-large-up{'data-topbar' => true} %section.top-bar-section %ul.left{} - %li= link_to image_tag("ofn_logo_small.png"), root_path + %li.ofn-logo= link_to image_tag("ofn_logo_small.png"), root_path %li.divider - if current_page? root_path %li @@ -27,7 +27,9 @@ - if admin_user? or enterprise_user? %li %a{href: spree.admin_path} - %span.nav-primary Admin + %span.nav-primary + %i.ofn-i_021-tools + Admin %li.divider %section.top-bar-section %ul.right From 33c276c7f744dd43ff92103a35a41e6df46814e0 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:08:16 +1000 Subject: [PATCH 64/73] Adding in new icon fonts to mobile menu partial --- app/views/shared/menu/_mobile_menu.html.haml | 31 +++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index b01671e6c4..e038c19eaf 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -1,7 +1,7 @@ %nav.tab-bar.show-for-medium-down %section.left %a.left-off-canvas-toggle.menu-icon - %span + %span %section.right = render partial: "shared/menu/cart" %a{href: main_app.shop_path} @@ -14,32 +14,41 @@ - if admin_user? or enterprise_user? %li %a{href: spree.admin_path} - %span.nav-primary Admin + %span.nav-primary + %i.ofn-i_021-tools + Admin %li - if spree_current_user.nil? = render 'shared/signed_out' - else - = render 'shared/signed_in' - - %li - %a{href: main_app.producers_path} Producers + = render 'shared/signed_in_offcanvas' - if current_page? root_path %li %a{"ofn-scroll-to" => "hubs"} - %span.nav-primary Hubs + %span.nav-primary + %i.ofn-i_040-hub + Hubs - else %li %a{href: root_path + "#/#hubs"} - %span.nav-primary Hubs + %span.nav-primary + %i.ofn-i_040-hub + Hubs %li %a{href: ""} - %span.nav-primary Map + %span.nav-primary + %i.ofn-i_037-map + Map %li %a{href: main_app.producers_path} - %span.nav-primary Producers + %span.nav-primary + %i.ofn-i_036-producers + Producers %li %a{href: main_app.groups_path} - %span.nav-primary Groups + %span.nav-primary + %i.ofn-i_035-groups + Groups From 814ee9847ea9441dbd9e01a500e2a1734787a739 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:09:15 +1000 Subject: [PATCH 65/73] Adding a new partial for mobile menu (off canvas) to restyle items in dropdown in big menu --- app/views/shared/_signed_in_offcanvas.html.haml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 app/views/shared/_signed_in_offcanvas.html.haml diff --git a/app/views/shared/_signed_in_offcanvas.html.haml b/app/views/shared/_signed_in_offcanvas.html.haml new file mode 100644 index 0000000000..e500646e62 --- /dev/null +++ b/app/views/shared/_signed_in_offcanvas.html.haml @@ -0,0 +1,14 @@ +%li + %a{href: spree.account_path} + %i.ofn-i_015-user + = spree_current_user.email +%li + %a{title: 'Log Out', href:'/logout' } + %i.ofn-i_018-unlocked + LOG OUT + +- if admin_user? or enterprise_user? + %li + %a{href: spree.admin_path} + %i.ofn-i_021-tools + Admin \ No newline at end of file From 54a70d9b08625239d1214001ab8d375084edd17f Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:50:26 +1000 Subject: [PATCH 66/73] Adding new icons into hubs fat view. Making it pretty --- app/views/home/_fat.html.haml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/views/home/_fat.html.haml b/app/views/home/_fat.html.haml index caddc00d8a..b9338d5235 100644 --- a/app/views/home/_fat.html.haml +++ b/app/views/home/_fat.html.haml @@ -1,17 +1,25 @@ .row.active_table_row{"ng-show" => "open()"} .columns.small-4 - %strong Shop for + %h5 + %i.ofn-i_029-shopping-basket + Shop for %p.trans-sentence %img{"ng-repeat" => "taxon in hub.taxons", "bo-src" => "taxon.icon", name: "{{taxon.name}}", alt: "{{taxon.name}}"} .columns.small-4 - %strong Delivery options + %h5 Delivery options %ol - %li.pickup{"bo-if" => "hub.pickup"} Pickup - %li.delivery{"bo-if" => "hub.delivery"} Delivery + %li.pickup{"bo-if" => "hub.pickup"} + %i.ofn-i_038-takeaway + Pickup + %li.delivery{"bo-if" => "hub.delivery"} + %i.ofn-i_039-delivery + Delivery .columns.small-4 - %strong Our producers - %ul + %h5 + %i.ofn-i_036-producers + Our producers + %ul.ofn-list %li{"ng-repeat" => "producer in hub.producers"} = render partial: "modals/producer" From cb5948047bea0eed4d3de0a35941b7705eb8b5e3 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:50:51 +1000 Subject: [PATCH 67/73] Adding new icons into producer modal. Making it pretty --- app/views/modals/_producer.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml index 4b4421e8d8..e9808b09d7 100644 --- a/app/views/modals/_producer.html.haml +++ b/app/views/modals/_producer.html.haml @@ -1,7 +1,9 @@ %ofn-modal{title: "{{producer.name}}"} .row .small-12.columns.producer-hero - %h3.producer-name {{ producer.name }} + %h3.producer-name + %i.ofn-i_036-producers + {{ producer.name }} %img.producer-hero-img{"ng-src" => "{{producer.promo_image}}"} .row From c2a2f2b3b8e4c2d7bc61af088ef1807d05e1f756 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:51:43 +1000 Subject: [PATCH 68/73] Adding icon for producers. Remove styling summary-header to distinguish between product and producer --- app/views/shop/products/_summary.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml index 22ce416336..ca9557d42a 100644 --- a/app/views/shop/products/_summary.html.haml +++ b/app/views/shop/products/_summary.html.haml @@ -8,7 +8,8 @@ name: "{{product.primary_taxon.name}}"} = render partial: "modals/product" - .small-5.columns.summary-header + .small-5.columns + %i.ofn-i_036-producers = render partial: "modals/producer" .small-2.columns.summary-price.text-right.price From 8d24301c26659a112d673f0cbf121e6b04b12e9a Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 16:57:21 +1000 Subject: [PATCH 69/73] Changing shop link to correct /shop --- app/views/shared/_footer.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index ee13a29d47..713c95c769 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -21,7 +21,9 @@ %h4 Getting around %ul.ofn-list %li - %a{href: "/map"} Shop + %a{href: "/shop"} + %i.ofn-i_044-facebook + Shop %li %a{href: "/map"} Map %li From 825ec1bb6318770817190ba2d1e84e2e2e51f622 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 17:09:50 +1000 Subject: [PATCH 70/73] Adding in icons to home hubs fat and skinny views --- app/views/home/_fat.html.haml | 6 ++++-- app/views/home/_skinny.html.haml | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/views/home/_fat.html.haml b/app/views/home/_fat.html.haml index b9338d5235..f888426d2e 100644 --- a/app/views/home/_fat.html.haml +++ b/app/views/home/_fat.html.haml @@ -4,8 +4,10 @@ %i.ofn-i_029-shopping-basket Shop for %p.trans-sentence - %img{"ng-repeat" => "taxon in hub.taxons", "bo-src" => "taxon.icon", - name: "{{taxon.name}}", alt: "{{taxon.name}}"} + %span{"ng-repeat" => "taxon in hub.taxons"} + %img{"bo-src" => "taxon.icon", + name: "{{taxon.name}}", alt: "{{taxon.name}}"} + {{taxon.name}} .columns.small-4 %h5 Delivery options %ol diff --git a/app/views/home/_skinny.html.haml b/app/views/home/_skinny.html.haml index 8798e504a6..8e68d7251c 100644 --- a/app/views/home/_skinny.html.haml +++ b/app/views/home/_skinny.html.haml @@ -6,9 +6,16 @@ {{ hub.address.city }} .columns.small-1 {{ hub.address.state | uppercase }} + .columns.small-3{"bo-if" => "hub.active"} {{ hub.orders_close_at | sensible_timeframe }} + + .columns.small-3{"bo-if" => "hub.active"} + {{ hub.orders_close_at | sensible_timeframe }} + .columns.small-3{"bo-if" => "!hub.active"} + %i.ofn-i_032-closed-sign Orders closed + .columns.small-1.text-right %i{"ng-class" => "{'ofn-i_005-caret-down' : !open(), 'ofn-i_006-caret-up' : open()}"} From 3d64f883a0cf6ca0e90ebc3f95d4249921bcdca7 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 17:12:05 +1000 Subject: [PATCH 71/73] Fix issue with double up columns - delete duplicate --- app/views/home/_skinny.html.haml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/home/_skinny.html.haml b/app/views/home/_skinny.html.haml index 8e68d7251c..768d16f2b6 100644 --- a/app/views/home/_skinny.html.haml +++ b/app/views/home/_skinny.html.haml @@ -10,9 +10,6 @@ .columns.small-3{"bo-if" => "hub.active"} {{ hub.orders_close_at | sensible_timeframe }} - .columns.small-3{"bo-if" => "hub.active"} - {{ hub.orders_close_at | sensible_timeframe }} - .columns.small-3{"bo-if" => "!hub.active"} %i.ofn-i_032-closed-sign Orders closed From 039108a07d65d7f16e9774661391cdf929c06558 Mon Sep 17 00:00:00 2001 From: summerscope Date: Wed, 4 Jun 2014 17:16:47 +1000 Subject: [PATCH 72/73] Styling label on taxons on fat view of active table for hubs (add a little padding to right) --- app/assets/stylesheets/darkswarm/hub_node.css.sass | 2 ++ app/views/home/_fat.html.haml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/darkswarm/hub_node.css.sass b/app/assets/stylesheets/darkswarm/hub_node.css.sass index eb30630ad6..d74eb35774 100644 --- a/app/assets/stylesheets/darkswarm/hub_node.css.sass +++ b/app/assets/stylesheets/darkswarm/hub_node.css.sass @@ -35,6 +35,8 @@ //Open row &.open + .fat-taxons + margin-right: 0.5rem .active_table_row:first-child border-top: 1px solid $clr-brick border-left: 1px solid $clr-brick diff --git a/app/views/home/_fat.html.haml b/app/views/home/_fat.html.haml index f888426d2e..30a9dd719a 100644 --- a/app/views/home/_fat.html.haml +++ b/app/views/home/_fat.html.haml @@ -4,7 +4,7 @@ %i.ofn-i_029-shopping-basket Shop for %p.trans-sentence - %span{"ng-repeat" => "taxon in hub.taxons"} + %span.fat-taxons{"ng-repeat" => "taxon in hub.taxons"} %img{"bo-src" => "taxon.icon", name: "{{taxon.name}}", alt: "{{taxon.name}}"} {{taxon.name}} From f28d9f9d9bf4a180351d59a794c212cc1940fa7e Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Thu, 5 Jun 2014 11:38:27 +1000 Subject: [PATCH 73/73] Fix distributor logo spec - Add a logo --- spec/features/consumer/shopping/shopping_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb index ecc988f7ea..78937ecb47 100644 --- a/spec/features/consumer/shopping/shopping_spec.rb +++ b/spec/features/consumer/shopping/shopping_spec.rb @@ -20,6 +20,11 @@ feature "As a consumer I want to shop with a distributor", js: true do end it "shows a distributor with images" do + # Given the distributor has a logo + distributor.logo = File.new(Rails.root + 'app/assets/images/logo.jpg') + distributor.save! + + # Then we should see the distributor and its logo visit shop_path page.should have_text distributor.name find("#tab_about a").click