From d29ec9d7730ea2cf07ccc2e9dc07dd20df5c391c Mon Sep 17 00:00:00 2001 From: randx <dmitriy.zaporozhets@gmail.com> Date: Sun, 27 May 2012 01:09:44 +0300 Subject: [PATCH] Images refactored, Feed icon replaced, Fixed comment form focus --- app/assets/images/Info-UI.PNG | Bin 801 -> 0 bytes app/assets/images/Rss-UI.PNG | Bin 789 -> 0 bytes app/assets/images/add_comment.png | Bin 823 -> 0 bytes app/assets/images/admin.PNG | Bin 556 -> 0 bytes app/assets/images/comment_add.png | Bin 778 -> 781 bytes app/assets/images/download.png | Bin 599 -> 674 bytes app/assets/images/new_project.png | Bin 257 -> 0 bytes app/assets/images/rss_ui.png | Bin 0 -> 812 bytes app/assets/javascripts/note.js | 4 ++-- app/assets/stylesheets/common.scss | 9 +++++++++ app/controllers/projects_controller.rb | 1 - app/views/commits/_head.html.haml | 7 +++---- app/views/issues/_head.html.haml | 4 ++++ app/views/issues/index.html.haml | 5 +---- app/views/notes/_form.html.haml | 2 +- app/views/projects/graph.html.haml | 3 +-- app/views/refs/_tree_file.html.haml | 2 +- lib/assets/javascripts/branch-graph.js | 8 ++++---- 18 files changed, 26 insertions(+), 19 deletions(-) delete mode 100644 app/assets/images/Info-UI.PNG delete mode 100644 app/assets/images/Rss-UI.PNG delete mode 100644 app/assets/images/add_comment.png delete mode 100644 app/assets/images/admin.PNG delete mode 100644 app/assets/images/new_project.png create mode 100644 app/assets/images/rss_ui.png diff --git a/app/assets/images/Info-UI.PNG b/app/assets/images/Info-UI.PNG deleted file mode 100644 index 7f48ed8d3f16541788d6d2c2117b6ac4afa7bb37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 801 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3m7>k44ofy`glX=O&z`&N| z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5Hkzin8U@!6Xb!ET9B*Y`a_wvimZ43-d z3q4&NLp+YJop#VWG*IAJ{qtWUYePK)16l-Fl-IW0`C=wmX*Q81QJ_)!e}kAHOK!B( zMYAbpPH&?kzO&_du_$JkFPI^y+mxZ`apH3O_SWLK>#z5Ik6q1puzaTF{W&x9_gVJM zQT04@<AwyoDk(<h1D+3z3K(CQUgv$F{DJd^$i%P?cB^!j;wdv$&0{>)xch+Wsa);~ z-ZKo{N}EETh@|EV9WP|q$-IYgUaG^TrXN@GYNThdr-hbsyqHtUpy3<5=lhCRTT;t6 zGA(#ft#81nv+~u3?{)GsPJd02+L7KaGWDzV2QdkjyeSRV3G4!bk=7TKwXgT2hOuno ziV>c;{+T`JnXrbn%*sle1do4=d%5N#f5SemrWy`~wC)35jq{B+C_WHu_&)E1hRwW} zo-=t@WhsCDtx>S($n~4|bwg$OQX~wx!cFBKSQXsYDv+w+l6gPrPUM1>tIkQvUf<2~ zhbd}Wi2VlcoZJ7`dFSxl$+>YP_@GHc_<=baS0?UTd?0z(ZH)`p4I&qMr-e6|eF$)= zi~8Aj#Y5nM#0BBhE!|xQZP<Mnm1n-UH5KBqEf4Hnz1zpZzTJ5G)CIkVS^g}2>!$Yg z?ux(q+t{`!-&T+QulRb?KOKg(95=SqI{8jr_gYwJzWBtqC(IuAob`yT4{Izx@chho z(c6xzLw|ATlm~>C9+*<GC`B)h>3yzR)4i>|9=_eD?{DDs={j*|Uu{az7M3}u8kd^> z3V-rH#%0-|ZM~OD*6&gJ#JVF(^~||GYnH#vCu$fxC$YT$JKy<{1>fpFHWO~x6`FPm z{3&Y?S2CJf&s#d>V731wl^efg8Rs$F&oVfZDrGO3H>tiTG%d$_b>{o#KxOAT3GtrV z(@LL||C_C0Ib|C$Co^U~XJ*Gu)3mKFDc1L!_WWhrc<Sroo<7+N3=9kmp00i_>zopr E09?OWVE_OC diff --git a/app/assets/images/Rss-UI.PNG b/app/assets/images/Rss-UI.PNG deleted file mode 100644 index 2116571ebbc705820beed79c20e6232ceebc6b11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 789 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3m7>k44ofy`glX=O&z`&N| z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5Hkzin8U@!6Xb!ET9C?ss9DmV4II|BpL zR8JSj5Rc<~ui1CRgo?0zxL-ZfH)PSV9cpWxqz)c(5)ljxxMAD0K+#o%RXR{QU0@nV z*90xDrroX^dJ-mj3C!NC9HEhsyqGgdpfgHCLotxE>Giw5*6*#)lheL;u4ZR@H>djk z&v)hj?q%7?MaRY6>)pHJ%^IJAN)xHIp@JKw*C#&NKQUEiHTUGe*KF1&-8Sysp0_i5 zQ}1iF{~we>U)Pwv$T`3^t-v=@{?ObVqNT?@t}^rREX&DDc_tm3>Jrnh{!t?DaH*~B zNAV<=J00A*cdh2>_FVfYd@l8wxbB6+6>{IdmOTDrvY<>y?FaAl54wJ-&!Sm#?Bfn` z+eY}Z-qMoPs_9jp`LmL-Mo@hl<Lve65;pDYyDq-}n0@+$VvU&Kc~_UYGuJ<=P_M2& znxSj_eaoXlf%3-&a=NA0Pn@=xICHk(N3(e|4(4br-tU?AZ^q2`k2Gy!BFu_p`lo!= z{;?_8KHBKk5%(MI@&?CFp1GsJ^ZnuFM@~Ov*^NI>?}*TPyGDGm)c40_HZ7ttT^-7; z56|ydUAoh@V)L5&2P=(xzMb5bU1+5=FD^FLREAGK>4sIYiBjIlGoLMt&z61_JG<fb zW;TnRn>H04fAmOcPk(>(eVgEG??u1ob6@%Koq5i?hO<+*=^N`mn7n9xVZP<>#P|ii zI;qc^Xa2Ovd)IJRSkPSb?#xS;3H2^AC(h*m+LdQ(9N+%2LdSUjYlGlPj+)Q5h6UX* z(7y1sM`@pwn3$N<-Nth>SMN$r*nQBFH=`k#H^PPIqr>wvH^Y|aANZ#+ci;CJGq&{j zY*_tAO?I)b(3`BI`Fp3D<Zk=ithsp4PkZz1D8HN8-=3$H{LwZyTJ8S#^zoCTLZ*6V uTQ?qlziZXkJG)~3%JZLiSg_-p`t?;0xnJ!Kd&9uMz~JfX=d#Wzp$Pzn?PZq$ diff --git a/app/assets/images/add_comment.png b/app/assets/images/add_comment.png deleted file mode 100644 index 1992303e7697ab615f6e21adb07a4dbe16ee2820..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 823 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFx~WYaSW-r^=9_n+(QNe$9<1l=LlFi-sbd(ukcf6 zP|L7lG+^Ao=o3)!bZKJKCEf()84bUdI2Wz_>{#>9%i?9o5*5FH_V?!|AJ3h0K0PeG zI>B`NE#{24x*Rj<n;#ph&)7b?_tE3}yx(2FdwxIsm9YN$>D~sh@0w;J)oSw|em?f& zPw<ss3)TluSfp1p9bK_Jl;wcypW>rIe<e$wGD(C7?BPh9!m6+$;KuTs5~cs-Sxvg_ zlQ^2*Z?NdR`m?ioc6EoXXl9LAMztRE0_88|79zUE=YAjDAH7h_^+vMnT!tee9G%A# zcU<&l{AgtTu(baUyM$wi*sD6>m;{rxowuTsMAp<)h_+c79g$mNlJTB5_)sJRv*C7= zn=QK{f*EH_J@eJb?6^rW8v{?SeB1HQihTxt3=&gzJk$AT^!1okLu<~i%oE#0RxaR5 zIP+#!D1&wPUVXQN_rw}Riw}owV^Ha12&n2?mc%8p^4s<v9;0lL8RZe34U?4xKRmt^ zbHI8xbHI*mPdnPwqZzu^D3}Jte2uwyOOM$gaiK25LS+V}Xod&J8dE<uW~r>|V`4td zFhxCi6+=>Ypg=%LgBHVz1Dl1ePhI)#NpRvSam5v^@7t>DT|!$l#a(~59r-T#(23{i z>JNt)TI`f#1g{y2M;M$`&rq5j)V-h0Ve0|Lhd<Bm^}Z4(etYpRg-J^o7sNc;_2$Hn z5C+EUwT8cBwd+gF*7Kd|P}Xs}pZr@vE!R*qtyFf+yIo~VW!GQ!U@188K{k6wA-nU9 zZ+s#z9t4L8&M{cz@5dL_^sC6daYK{9q%Dz)c^Fzwa4$P_vG}3;m5--_#0odxV^(u| zrzZF9M{4_PmDfl1yk~OAJ@-UfKJV`$ZsYAsvzPd+<+9eiC&G|^bT-3-Efsee=7_Hs zZV-P|%J{);4<AEZ=W@0Ob1S?U;<}bIJy=`8#Squ6ZzO)gXhz(+na{87`2W7(>|4GC f?-=S>B^aJ}^u1_$+HcOlz`)??>gTe~DWM4f9t>)6 diff --git a/app/assets/images/admin.PNG b/app/assets/images/admin.PNG deleted file mode 100644 index 73ff1dfb3340e284e9b4ea906262f01812dad0a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 556 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&N| z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5Hkzin8U@!6Xb!ET9BqL(MxM_k{5d#C` z8c!F;5R22fllNwaItm=E|NhB@#U#Q*$>xtk4$J-o=SxSfMIAhJ>Cn;1M!s4b1#|zf zv*jgDo?+4`;yKaFW7mnJ*IO1Wa6O{ZB(a}Ev*~);x*W6oRdeTB8W*2CCzg_y)_g$Y zgX<-A<7l>fjQT2XnU6@UT*cL(#ClwUQ*jMLd4q3)XvLd{dIi!Ns%N*(FgkXltWLn` z1(Ur^+0}!+zoie@e7JQ+ZYwJnJ3n*$<iuGyyY9SaU@nb)KfSJyqvp&c>AvXd>&$j7 z0&P}lWlRzb`xvJSe^4~wmSOnbFj1xKEO&2N%!Z{oXP6`=Un#D?bf&EFp-MViMKIIy z&4SVo)-H+bnHZLmV0ihVkU^N&EcSKP8+<LUw*ODKmclec=gb?P4_rHDGcHrz`z3rA z>zduaawp$E5R#boykV}-)3EmM2jmq}O!j+Q&3<>#IQ*|>z_-d%e|SE`T$-%(o87)q z@mDnSpRc`p7-Obv2~~UW`P^zoF`<n?UfGlKm|{Jn4c-2UuXz1yv;HMf&+m=4?7ocr zwz=oe_<7x8Te0fZi~KV$dYHu<L_PPPS;L*<ZMEsqe}+EgDay+Kc!U`k7#KWV{an^L HB{Ts5rOx63 diff --git a/app/assets/images/comment_add.png b/app/assets/images/comment_add.png index 98291d0d2ec34bb277621675008e7e577fee1d2d..836557ac8462dac7811ac8cdbde9d5531b8cd553 100644 GIT binary patch delta 698 zcmeBT>t&k|U(YHf$|k^{GlPwRfvMNi#W5t}@Z0IO8KRB?$Ls$KBq?bA(YWH&v9?uE zFi1j0X;GLa3-{jMRxw9cmw+ou35pXF99#k%S!NzSbSmNptJ4-CpXmvy$`XoNSxjBW zCT!fv{(YMFy}d3XhRo}4+`T#T{=f3Fe0iOl|MO<$8?;<t*iz55uj7Yt+PAfN4FXQ; z7npNc(!@C~Fx0TUn|*WZB?iw)B_2{tVft=y-?bi|Tb5b1QO$wF@jz&~y;3M|^|SZy z>==7ItGIla-X7pfSi5_>$ETP-r}p^2+o$MzxwGcNF{Te;3Bd=mR5H0Frj*<~vyAIO zx%V!HoU(GG30z0K7Ff=!zie^--qY~DCGzj?O<wl$Ld>MuHx~;W5`M6Di76}B@0!k4 zGR2>?f8Xt#+%CX2Nkx)Jam!PMw8m{3J2f_5s_Z^_hEJ47c0!3rgs7$=Z;Zb1?u{Ce zAvGRVVsj@2AF#Oa<lW{;-&zH%8WN4Gr|yhptSWYm;8XCM=h*9J$2{@>OP=~a76FVu zW_?|$$I7M8of*q=ML+Y>-SZw<Y<b>Q{Cm#q+<N6iY#n#QyBcNR%f*p`-<Y)T{7sv+ zOgV7QJ0k|()NKmhWos7vmNl?zKl8U+)5*0~?`052;*B%MimvY4%CLoV$Mo34aj%=h zOL$~|NUl^WkAL<~f0D|}HH9hiyME8RQ?EN?e?!Q(<SXhgYYuX0y%k)bzq*2b8Z&$2 zWL8e?Vz<WJv~NqFX-+6%e!;ZuJmVhL3WN5lQ10S##`~&sJ0@SR;@^^%-}pE1z$&M+ zw|Wmeyt9?pfb|Yj9CP{EH_mtU7gg!BTwt|fn`NYWZ^q4EyZRqGojudmIQPJDk4}5$ z363_#?B90%F1cC$B%gJKgU2n_Gk>l=FXLEP`_ljTq`$)7xbJ*o>0I!eDV~9Wfx*+& K&t;ucLK6VX-#jY- delta 695 zcmeBW>tdS_U(d`Vs%)aTF7Pq~15=l$i(^Q{;kVQ6GeR5%+V{tE7)}uRr+LMxV{NOT zV3350lF@ms)`W!u+`3I&9Sc^t9&l1R*wC?{iNj1R?3mMiE~hO*KGPFYl_eClvY5J# zP1sn;{(f3{`Fo+jBRnx1cW*Yn|F5j<zTBD{|MOOvOE_gPTGcbgyZvD`{(a5Ffn%Y# z1j9C_Zf}+hMmuKyvv1ro8%%twReBj;Pgh=FJ+<KZWR;zF1Qc2n9_-pJKY3M~?dS6H z`Hag{Y+2J9^Ah+sT)b<oQmI#$dQZLl{v?%?K6V+|j1}q|)+U%vGGXuW+Le`7%=)2o ziT8oBa&_jF4r^F%J+`c0Tl!6Jf04@Hg71wgp2xC0^U^Xo9&&yNyVS<ix;Ji-*6}%i zPSt&X^hB{`qKU7&Ge@jthwB1uFFmg{Tk;HN-kjL9(0NiH^J^v5XN|K{leUYgc6af6 zo?jGP#5RNN)}7kGON|0f{04bx>y5T&A4pioahmbSN#hkKPo%4SvY*{Jzn(>lA%3%+ z=~9P>sfxK>4Q;Atcm1~Xe0w0)^L^uV%k6z^J5T2`UYMV+;#s7qeaJDPclUk2NhwNQ zm*d$MEIlKZa?($vWIyw=>=QP7<|u_+c|K`fi@>q7Ia=Xwt+^d;H?ZF{ebZ}K;d=Z+ z<NS$QMc+f;{ZsP2e2>lj+s57RPv32-|H<u<YVYPeNl$Fef=lxl+BS8SCzuvUSj0}) zV3aO&BQ-5vY95p4_6ECza^45B2Np}c3e`Pxm$hbkiI(5J7q%B>?q%h3V_eN;n!TOL zz4*G>0ht2!3f?>BoB4hBcg)%-;3O~5u+68_JZ;;~m&rRqj5il1=zlN_dUT#4Mc{nn zUxRmc@!w>BMl)&&OyY_7vHJX50jKY$=J$#IR(~U&-oxmt`cW)~fq{X+)78&qol`;+ E0P^H9%K!iX diff --git a/app/assets/images/download.png b/app/assets/images/download.png index d718e07dea3ea6645a3375291f27446661eeb331..5791e723de9063bc7f28764d14c987c2cd277188 100644 GIT binary patch delta 650 zcmcc4vWRtpN<Cw7kh>GZx^prw85kJYlDyqr82*Fcg1yTpGcYi47I;J!Gca%qgD@k* ztT_@43=Hfgp1!W^cUYxFc|<<F+cK4bfl0~J#WAGf*4x<!a}OKvxYl#=FJdgpQ19@! zt!89=$F}qNB{?Gp^MZ-2w|HN1zG9L(pll($M0}w^ebbGJDS?x6KTSE%aNxg7&=Q_} zz3JT7a`+>5u9b5z`|_Z`B4PV&Muu0r{{6R2TVCcp&p&9z*&CnttuKvbX6QSv?9RZv z!M8DbVd-g~pypF;HJ_Lk=<6&yVYvJG^v?S+%sz+K$Y)*upL{#y|EB7nrL{|zOyhI@ zH}lu*ojP-pd<*W@uQ;>q!jdR~*uRgJPV`PloIJ7W#bmbwK}U<ZW-vs2dRNSHhk3)7 zyYj3X*gno-;%Q(sU|>7IAi=<#z`&Dm)T~0eBx}1pgIsX&jfcD?pLuL{x;XGHnE8{< zJgU8x%VXg=<Ms=TC${o!m%7k=K`(Gmpx~8mk*bS3BlKE-eJ$g9akT!^Oa~3$qtUX> z#*G193++z)V&Glq6H=3^eQ%}UB&S+cj)jw)_OiTYF?|`LP_w&h{uQolj^8X&bCquC zD703w2e=B|pEd96lEV}D_FoXNVmKP|@!qn72L!BUyQ$x>Sfki7L;BmkBf)pr1Ni-y zo{p5~Vfe`M^HsEsD@%aygsCF0>U))zc&s~O<3C}3u+&@)1{*$q-qPcqRhm|UPLCH~ z?Bq%~#B%dxSN*bY`X{#Tc*^o}>qSqdhNmo%Ekg1l4G&o&y%sjr^$7eqd*KAj&gB^; zlb8(*Y(k}c3Qh~0ToRzayzDl+&{4BLAHST+{mSr<;q;6r3+~J_vSwglVDNPHb6Lmi Hl+XkK>hu|^ delta 574 zcmZ3)dYxs0O1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_s8To-U3d z6}R5Z_RVWH5NP#1y7xtwsk?@G!ue&f1r7HUb~^4(4fPY);n>HZzM$}RSYXS+dSkPS zc`Yt2k1Fh{-&FQ_JgZDIeBJ4~?gitLP3)zyn{`gtz1zL+cm4kR0&aGy+5GQ+pL)M@ z*0P0?4h$v137J{Co`$9lDz7Jp*`3^Wa9ghLt<U?|bTrQwdod<6)Xci;zxDX}eW|zi zmuT;o+b%NSa{o5AncvJ!Gc8Ow%$Qxf6?B_II97^EDn7Hl#bc56VG5HLL!Zqr6XtCU zGPPgA8IK6qEM;I+U|^|lU=Uzna$w*9@w#_yxbN&Ym)m()?XDS275ifUo@3u3UMRsh zql_<6<nR2PYYp}s*Ol4U@8bC6#&z*U+>vJan0HLg872GzaUspu@3MVoXk@Q%Tf@xu zQCacT66rmeieDrZSmbItBRS_WH+@Kz+LNn!Mlpm@#H!U_|AXGL`Stv<q2H@Aj6<p# z47w)H&yg;A%4Vq8W7W#HOjd7Vjq_8jijL0=8K0NLzDQthD4DQ+U2{7F!&8Nyzdo@U zE?v-fB*y9l|7@q@;tb)>R<^IRSjg|1tMEmSOZGm4kL(kTea4REe6J&7jyqcEmN+pk zc&xy^=D|kB6&4<R9A8se<o}!VoRmpn4SdnUk#N#xE{jCT(lhhDPTH;#s;aaqa^-&z d-N4AO!+p2ZpG}7I7#J8BJYD@<);T3K0RU%j?MDCr diff --git a/app/assets/images/new_project.png b/app/assets/images/new_project.png deleted file mode 100644 index 045dc705ba3da4d6e970e363e97402a99d78ee07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&N| z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5Hkzin8U@!6Xb!ET9BEc!fxYk>+i-Ccm z(bL5-#Nu>v$^ph{da<+495|rB{Itl$-90=h`1qj)=_LjR1`!G$H%c8i;-DyThwYE@ zF$TAcjO7Uz*PK3Z;6S%Z*_6h{MoHhhmSPzpkphV`O~p3Khj23UDP8${T=CrD4s}&I z$Fj1L5)<W>8xPog5f%z$h|jY*e&E0dX0cm4L>L*Ex<#~hEtpo$z`(%Z>FVdQ&MBb@ E02pag<^TWy diff --git a/app/assets/images/rss_ui.png b/app/assets/images/rss_ui.png new file mode 100644 index 0000000000000000000000000000000000000000..c45afbab519ad7582f5c4558b28a95424aefdea5 GIT binary patch literal 812 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3m7>k44ofy`glX=O&z`&N| z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5Hkzin8U@!6Xb!ET9DkUn-#&X5cn}LC8 zji-xah{y50*Zey|LuJ@MoZq|eBA52&ox5}|C}dnz>gv$Yn4#zw@Mw|KLf@3`*+M*= zZV$Yg7d%qZ<y9*Xb-8nN&jMG++*?xwJ6o?VQdpnS%F>(vZ0m~{%h-FfcV4`~FE{7A z_49xGp8x(`z3E{=#{HYxvp0&)?44?;x4-)MnWC_euW5VQoY(d4>74%g#FK!c=H3+L zTlZ$Ezmr=3c-P1MdpxGiInOqiH{u{uUdQX$9pdFm?<G!FH8dV<IXiV3PkzZ%*U<Yt ze=DTQA1<3W?}zlp6|bTT6)*M{C>TjSv^i&z`ooIxZnOBu0DtpyeoS7;hR5W0w8$51 z(mZS}m}A}dV5!_1HKw&wc_jB8zPF4g-tE9)i*0;2a_o*iket)&R)6Sy=fv0_i&nf6 z?^<<kwvo*7i+<m}bzLk9ZqxO&DSK4+=HTRw@1iPMkIyn%BNn>1qc(VkZ^{?`%u^q{ zgWJA;)RF7giMH%gfAlM~=JLw<rjlzP3FjO>FY(AFxNYi*0%^N`y%zh8n>7#TyN2o? zDZADk*w<cYE_XP3M@Y!mdnZ1G-<ckh$9=Ew_4k5vB8zJ`y>*+Twd&W-rAt-2ce9HZ z8d!b~3B0=9Jk_H8^5mH5>o4-`w#{x3{=HxJuCcv6zx<=iPi8-V{HyuJztYC2|8*_F zvKwaJ_-2~Aqv8A_yW`Ct-yE-P4BL2N%EODxc+NlA#&?6+HB>yX+^UT4MqJ3(zGXc3 zzn9)!p?UbVfefE%>W__weSFw9&X_)V$&S>h1)nutYi!S)J-c<6>|EpPrN<9cH5UtA zU{H_VuxJ(kqlxEcuAk(0zbUqJ?!NCcB-GuG-4LmN+;`E8(@gcFw5sRiO><>^B%Z$g zKQr@k(V@8A_Qp#e$M2n(Y5U6F&TrkM6NMYs_VU(UPd!=uy69WIje>YN|Fr*1-N&8? V_N-G6VPIfj@O1TaS?83{1OSiZeb)d0 literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/note.js b/app/assets/javascripts/note.js index c45cdd90b4f..4d97ffefdce 100644 --- a/app/assets/javascripts/note.js +++ b/app/assets/javascripts/note.js @@ -32,9 +32,9 @@ init: $("#submit_note").removeAttr("disabled"); }) - $("#note_note").live("click", function(){ + $("#note_note").live("focus", function(){ $(this).css("height", "100px"); - $('.attach_holder').show(); + $('.note_advanced_opts').show(); }); $("#note_attachment").change(function(e){ diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index ca797ed06f4..08dc2ec9209 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -420,6 +420,8 @@ a.project-update.titled { cursor: move; height: 70%; overflow: hidden; + background:white; + border: 1px solid $style_color; } @@ -960,3 +962,10 @@ li.note { } } } + +.rss-icon { + img { + width:24px; + vertical-align:top; + } +} diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 246d43e8703..d73072f2672 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -100,7 +100,6 @@ class ProjectsController < ApplicationController end def graph - render_full_content @days_json, @commits_json = GraphCommit.to_graph(project) end diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml index c9f12aacf19..23ad920d8ce 100644 --- a/app/views/commits/_head.html.haml +++ b/app/views/commits/_head.html.haml @@ -23,10 +23,9 @@ - if current_page?(project_commits_path(@project)) && current_user.private_token %li.right - %span - = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :class => "btn" do - feed - = image_tag "Rss-UI.PNG", :width => 14, :title => "feed" + %span.rss-icon + = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do + = image_tag "rss_ui.png", :title => "feed" :javascript diff --git a/app/views/issues/_head.html.haml b/app/views/issues/_head.html.haml index 99c61d75528..157741dda04 100644 --- a/app/views/issues/_head.html.haml +++ b/app/views/issues/_head.html.haml @@ -5,3 +5,7 @@ %li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"} = link_to project_milestones_path(@project), :class => "tab" do Milestones + %li.right + %span.rss-icon + = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do + = image_tag "rss_ui.png", :title => "feed" diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 1d71e3926f9..86fd6a4add2 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -2,10 +2,7 @@ .issues_content %h3 Issues - %span.rss-icon - = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do - = image_tag "Rss-UI.PNG", :width => 16, :title => "feed" - + %small (#{@issues.total_count}) .right .span5 - if can? current_user, :write_issue, @project diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml index ec07411a28a..74ffbecbee5 100644 --- a/app/views/notes/_form.html.haml +++ b/app/views/notes/_form.html.haml @@ -10,7 +10,7 @@ = f.text_area :note, :size => 255 %p.hint Markdown is enabled. - .row.note_advanced_opts + .row.note_advanced_opts.hide .span4 %h5 Notify via email: .clearfix diff --git a/app/views/projects/graph.html.haml b/app/views/projects/graph.html.haml index 394a11fdc47..799b4e4e369 100644 --- a/app/views/projects/graph.html.haml +++ b/app/views/projects/graph.html.haml @@ -1,7 +1,6 @@ %h3 Network Graph %br -#holder.graph.well - +#holder.graph :javascript var chunk1={commits:#{@commits_json}}; var days=#{@days_json}; diff --git a/app/views/refs/_tree_file.html.haml b/app/views/refs/_tree_file.html.haml index 3fcc37331e7..686ad41b38b 100644 --- a/app/views/refs/_tree_file.html.haml +++ b/app/views/refs/_tree_file.html.haml @@ -29,7 +29,7 @@ - else %center = link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do - %div + %div.padded %br = image_tag "download.png", :width => 64 %h3 diff --git a/lib/assets/javascripts/branch-graph.js b/lib/assets/javascripts/branch-graph.js index f46dbd17754..3276886e77d 100644 --- a/lib/assets/javascripts/branch-graph.js +++ b/lib/assets/javascripts/branch-graph.js @@ -37,17 +37,17 @@ function branchGraph(holder) { r = Raphael("holder", cw, ch), top = r.set(); var cuday = 0, cumonth = ""; - r.rect(0, 0, days.length * 20 + 20, 20).attr({fill: "#474D57"}); - r.rect(0, 20, days.length * 20 + 20, 20).attr({fill: "#f7f7f7"}); + r.rect(0, 0, days.length * 20 + 80, 30).attr({fill: "#FFF"}); + r.rect(0, 30, days.length * 20 + 80, 20).attr({fill: "#f1f1f1"}); for (mm = 0; mm < days.length; mm++) { if(days[mm] != null){ if(cuday != days[mm][0]){ - r.text(10 + mm * 20, 30, days[mm][0]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"}); + r.text(10 + mm * 20, 40, days[mm][0]).attr({font: "14px Fontin-Sans, Arial", fill: "#444"}); cuday = days[mm][0] } if(cumonth != days[mm][1]){ - r.text(10 + mm * 20, 10, days[mm][1]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"}); + r.text(10 + mm * 20, 15, days[mm][1]).attr({font: "14px Fontin-Sans, Arial", fill: "#474D57"}); cumonth = days[mm][1] } -- GitLab