From d8d36aca3d65a67a2f073037d3fb13077d1182d4 Mon Sep 17 00:00:00 2001
From: Michelle <michelle.sanver@gmail.com>
Date: Wed, 17 Oct 2012 11:57:13 +0200
Subject: [PATCH 1/2] New github icon

---
 app/Resources/views/base.html.twig |   6 +-----
 web/images/githubIcon.png          | Bin 1058 -> 3340 bytes
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index d422be5..00e85f7 100755
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -67,11 +67,6 @@
         <div class="contentContainer">
             {% block moreContent %}{% endblock %}
         </div>
-
-        <div class="contentContainer">
-           <p id="githubrow"><a href="https://github.com/protalk/protalk"><img id="githubicon" src="{{ asset('images/githubIcon.png') }}" alt="Github Icon"/>Fork us on github!</a></p>
-        </div>
-
         
         <div id="footerStrip">
           <div class="contentContainer">
@@ -80,6 +75,7 @@
                   <div id="followUs">
                   <p>FOLLOW US</p>
                   <nav>
+                      <a href="https://github.com/protalk/protalk"><img src="{{ asset('images/githubIcon.png') }}" alt="github Icon"/></a>
                       <a href="http://www.facebook.com/pages/ProTalk/216612481777731"><img src="{{ asset('images/facebookIcon.png') }}" alt="Facebook Icon"/></a>
                       <a href="http://twitter.com/pro_talk"><img src="{{ asset('images/twitterIcon.png') }}" alt="Twitter Icon"/></a>
                       <a href="mailto:info@protalk.me"><img src="{{ asset('images/mailIcon.png') }}" alt="Mail Icon"/></a>
diff --git a/web/images/githubIcon.png b/web/images/githubIcon.png
index 88a36b2bd623a90a1d0de5102b39ba9fd9ba8727..e6ccbc2face3f6e3b55111f6f50942d04a1b216c 100644
GIT binary patch
literal 3340
zcmV+n4fFDeP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R00009a7bBm000XT000XT0n*)m`~Uz5j!8s8R9FeE
zS8Z%l*BO4UeeG*IPVCr8NMaHU`EU_mAsZb-T{Y2F)u65DB&a%A8B^6s(>kq_D(%n2
zk4e)iq@tnmhaVF~z&cGxEvl%rXhLOBm9haL6{^Em_-YEoNt`(Tx*y*2p5%fd2JOd=
zeC|Cy_r34)p6C5I=W3NoMFUV_$B`pPR(E%I_xgN3uWj2hCC~mJP4sJy<5<JP!|BbN
zH=mzVs%bO;nx;iA4PScC2pHSEUa#Nd@jL`7GSVpb(0r{wu52xN8UQY=#CE8sr{~v{
zoz_M0^5x5aYHx4fo*qu4;>@9OUX+P3WJH0N%Vk)$MOx+?QXz>lFS5F>3lJ>JQaZ$N
z(It24Gg7J4&(i5jvZ^<<4?g%{)w*@-&Ww+b`zT~nz$?Pi$OfjTr!g=vfUd4CEM2-3
zb#-<3mAP`&%w#edoIQJ18L)o+dL>&eM;2_#dt<R!@#M*q-_dDJFD>@*L8Tg8=n4b^
zxPJXQcJADX<;$02)v8t4uwjE@Wps2D!iXrBRkyXZfs4S=qeqni$z&31)~rE8qyd&m
z*5+6c46-9wf!^NUl+J;4wPFfUp9)I#UoKNqQ=lL^Iy!LW$`$P1y;~U|&x9dqrfFi%
zzo@UT$BGpzP$(3T&*u@1MwN_v5rd`6yM8vEgIT^^iAU~DO-;&|#X=F`aF{RZ?4JAJ
zu0k=uqTg-$UEC(@g+d_(_K3>rzZDPZm>*FTaVZ-a8JS(3W5bjnG)ugfP~-|rMd?M=
z%cUZ$Qi*OU$;u$_oj!f~K3mnORbx$MLDhsB%Bn<(_<8^S{q$o55Ca?_Tejh$KMmar
zuZOmiKbxyB($A(-LC{lyL63?n<lVl$KD4y7C^yNX9&HaN{M=L5M=Tl`8X7`47{o|s
z3OTMg6||6w=!p3o7*0v`sBR+_Gq9qe0=rbeS7TFX2-o4lg$pWfBrQc}tyYr(m;Q-~
z355Apn&7XkOyHf3PczyRFlVwTnDjSSEDU(bhN01*hDKzV341<1g*~T7Aj-4Ztir9e
zdU<f)fNBffvES!IjzUkj)MMwS@1kkh8jJ@QBbvXB(AO7;Y$)Y0i$J^+6Y*teT{wZ?
z1$0~<%i-@=3BYI<eM%=i@MsZJE)eS^EhHV?F8>$MchbJ!vj9!4Ex0@5!@;$iaOvtj
zARLET$g3O|nViv#zrFe<PM;b=a8Wm&>u#25G)5!$b$dOt7@}J+rCKTmWZ+UIIn8nm
zjREFix=AaRO$H&$GROYKtqeXHF_+~oou$Jgf!h>g8D?#eGHf$q*(5-3-n^;61XPNa
zw0Jx|YnWK$8j#E7P-I$3y_YK2)}FvG-})8)aQG8UjAzjlEMUu_Kck~PjLK97*<1;k
zu}P*WBY*l9HtqR6`oGl;WWK?%GlO{k#g~yxE>^k(gPRa$W@a!sIjOQjuoVL`kcuUR
zL&mNfLctJrZ2t+a-X6to_8!2yZ)`?O$2Tl}B~TcF850&)?%^2a3B>MxL0?Q`?}r08
zc2~nc{`d>DClU%+R<DW`3zbw!-ACvGV`6Y{@U_;~*2B#C${ZV-Mq11C@5rqi+=P1I
zqwhZX=W%>_<})k}6!6r-1&D@&(B^3NQdyB%@%6n72FJ>9TD$Se#vh`&xmhvlmU^LH
zTq`>+F*RatQw&Ii3Pob2WUHsbecK<x@h^vQ?BsF0_4=FG{PK%f|Lil!WT&xj{{b91
zu!oY8q!xP-skP5y=R0rXmG(9?H%3+Y7Rsx^DX8L0umn@FEtAp&T;1iuz_E2dwr=?`
zytx7nd~^gE)`WU)#R10LwR2y9q@z0-N7tejB%0$$e|`df+eB+Tru;0y?CKPi)vbD7
zF;M+b#*XGi$eck)ckrW4Td-l{2Am%nMDLO=ocPyCOy0SN@4fJXqBp`aJvKH5Q@ese
zR?TJH31!vQAdl)-HDPX2@~K9XH1r~0ETMBzCk`JvgmB5h*-uX)ShCUkR0@liEMW!I
z8B9KOc6Oq_f3>3ZNx(IL9#q0w4@H?}nds~9$I|61RNkNa&%d#2*Dkd=$!S2B=$4}w
z-NuWGA&2!&RyKd@nUC@q1|A4X`H^kcXO|K2d*L&JD6#O!$<Xo}u#5mKQeI+4c#Jyu
zi5hguT-od?@qwn=qna^LEz091V?x7qPXlfmt@!NTr?^YnhnkWYy>SP1!A5wv8<yH5
zIC1R~8vF^g(~zW{MTEPh$#{BFdn^NT#^pAG2~QAz4Rm8)tOxsV<#Ax(GFJcgU5utb
zN9*%1A+hOo+&=#yI$nAegX1lD|4bSO8y8}4D1~$W1>~>xHtZVpL<XcD3>XV>!WTxD
z#c~^IL}<q@meC@j%Y$hD!CLrvHt62|5%QS?`hNNx;>jWc<qGm19q$LZg*$m9tQ^W@
zVz$b-(CS`!ECcdbSV&n}#JPwup4{w4KZ0$X&j--b_YCqkbmWE|G<1F&f%-NW^^BO7
z046Cr#aQUK^2!Z7hd%`FW{MOdo%Pw08m$1UPQ+rZrFqa-zKgh1#93bxu32>$adh0F
z*?zuI<XOY3%NEY0V2?96W0r#yeZQ=n#me$M7>pr{j&N7+f=e~z#%Jm2bb6Ruqsijo
zewaMOibd)c*;D9bpD_(g1Po*r8<^p7vK*l(e-bM}uZ^ftMr^u-2Ac=d3W2!*o*+ep
zjV5q`>`WSu?o^y2vA<H^hWs@9OCpijA!k6cF)wO_AIWJiW5TPEW;w~vlj0QTY*HbV
zOD&Lhq*phBYy23JGr~T8AO76^IE@ngJ)Y&a$ybt;(ppVoLRt-MHSdDCbgRj#%iMNc
z<|cKJ;BS+SDKS9aQ#$#1zA~9irg&<3Vs=#N{GWylwhDc&v6~k!UQBP@x^-yoMeV;X
WmJ?@UY_gRA0000<MNUMnLSTXzl3X4D

literal 1058
zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyaaL-l0AZa85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YPV
z+ua371Hn({-St3<v%n*=n1O*?7=#%aX3dcR36>Q&rUPlPLl{<Z11)1<X7Y4#4DmRA
zcG~IuD`6tX>aSm)Tseb<zu#f9Q;(2Ci+hZigVv><Q%o#ETRM1injCTx7~kCR{lU&L
z@dkV23%1VVi@LW2rAMuF*!@z3lT*pDfy2sK_}ILjvnmG3Vm=BkWkw;ag-eugK98IK
ze%|}fmfIXYT=f0<Lts8*hoVa5LIZ{ujnyJ-Eh!ac5`qu7I2S$&wT&;$cYE{JmaB6?
zOjfVxYttiZ_?LNe?6PkuSA4;#ru{%vY?95vs2{V!(^x+gq}`dX=a|Hm5dJ(|=H^e{
zD2tY-(+a#NyEtj>5?jjj=g0HhbFn`wUs*D*51X)RX0C3`TiY(-Y{f;>IK|!W>7I)|
zV61-V+mSFX*Xi8$f8}Nzj~DJYaVS5Y72^B++tSl__Ln~2t9#UQ>g<zoIlo0ad$X4x
z3VW*%y1;#>p@wMYyH|?}eYF|#4zenCxQ0fR)%Tm(dzI<@XFH($c)Hgw&i`Kz{V3O6
zHS2e3MN0S1Qyn>(`ATifaji9a{;@hezb+-Nym%txo#ydh`k(HUePb^FtNM-cW?=mN
z=V7O=<@eoQ?@_p?`0uIa`?Iopmbn%>F|}w(mV4c){L^2m`qjN^&4Vxgfp7BdWVJ+k
zQr~I^Ut~L5BR%=c*%v<&S*ji!neohMf&ZG18=rp@O8)7fAtT1yEtXTx^=;*=Th8~s
zp1<!XayIhhmdon*XGc$(GGWQGSoQ3cDc1tuhg!Uy+F70YsCd5FjV!4NQJ0M#AKk2O
zvSpj(CcUn|2^?#GdNV8XR%hgGdy+Fh{&R}a&aY>Fe)h7svieGEz+%I_rSBPStCf9!
zKTNL5EV**W_(%Brq~gt)_xG2-Kf3?sn*B<Q3UAx{=iiuPbDMpFtkm*9LYr2eE|Gcr
z(DN0Ws=KSP*@vUIID)*?xTbwQylaR4+QwNa`Tu6k(})l|@JRIYjFQ)po8Af>o%3Ys
zJ=ZmBC;v+0)l_BZXI~%7eM&WL@#=Ms*KdFODwA_(%8Rn@HbHZ1AIT=pXa%ilrk1l#
zPH{7u>E3*O{qww~m;ZA<`M=5k)AmnN{g!`&>}PSr0kei`iEBhjN@7W>RdP`(kYX@0
zFf`OPFx53O4KXsXGBC6<Hqi!>1_p+C0!b(ua`RI%(<*Uma4=qR52%5`)78&qol`;+
E0DS<xfB*mh


From 75abda7169366df1c105b09a885ef69c78111e51 Mon Sep 17 00:00:00 2001
From: Michelle <michelle.sanver@gmail.com>
Date: Wed, 17 Oct 2012 12:48:23 +0200
Subject: [PATCH 2/2] Added a fork me on github ribbon according to @rdohms
 diff and the github icon under the "follow us" footer.

---
 app/Resources/views/base.html.twig |  5 +++--
 web/css/main.css                   | 19 -------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index 00e85f7..a5e3bc6 100755
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -31,6 +31,7 @@
         </script>
     </head>
     <body class="yui3-skin-sam">
+        <a href="https://github.com/protalk/protalk"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a>
         <div id="panel"></div>
         <div id="headerContainer" class="contentContainer">
             <header>
@@ -75,7 +76,7 @@
                   <div id="followUs">
                   <p>FOLLOW US</p>
                   <nav>
-                      <a href="https://github.com/protalk/protalk"><img src="{{ asset('images/githubIcon.png') }}" alt="github Icon"/></a>
+                      <a href="https://github.com/protalk/"><img src="{{ asset('images/githubIcon.png') }}" alt="Github Icon"/></a>
                       <a href="http://www.facebook.com/pages/ProTalk/216612481777731"><img src="{{ asset('images/facebookIcon.png') }}" alt="Facebook Icon"/></a>
                       <a href="http://twitter.com/pro_talk"><img src="{{ asset('images/twitterIcon.png') }}" alt="Twitter Icon"/></a>
                       <a href="mailto:info@protalk.me"><img src="{{ asset('images/mailIcon.png') }}" alt="Mail Icon"/></a>
@@ -97,4 +98,4 @@
 
     {% block javascripts %}{% endblock %}
     </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/web/css/main.css b/web/css/main.css
index 0c72ec9..afcc051 100755
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -1008,23 +1008,4 @@ form ul {
     width:165px;
     left:0;
     margin-bottom:10px;
-}
-
-#githubrow {
-    padding-left: 20px;
-    float: left;
-}
-
-#githubrow a {
-    font-size: 1.3em;
-    color: #3a668b;
-}
-
-#githubrow a:hover {
-    font-size: 1.3em;
-    color: #0096ff;
-}
-
-img#githubicon {
-    float: left;
 }
\ No newline at end of file