From abc2bdc3aa49c2651f83dd6c577d4e61fe21293f Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 10 Jan 2013 08:43:25 +0200 Subject: [PATCH] Remove unused images. More use of font-awesome icons --- Gemfile | 2 +- Gemfile.lock | 6 ++--- app/assets/images/diff_file_add.png | Bin 177 -> 0 bytes app/assets/images/diff_file_delete.png | Bin 295 -> 0 bytes app/assets/images/diff_file_info.png | Bin 749 -> 0 bytes app/assets/images/diff_file_notice.png | Bin 302 -> 0 bytes app/assets/images/event_filter_comments.png | Bin 750 -> 0 bytes app/assets/images/event_filter_merged.png | Bin 463 -> 0 bytes app/assets/images/event_filter_push.png | Bin 632 -> 0 bytes app/assets/images/event_filter_team.png | Bin 1337 -> 0 bytes app/assets/images/event_mr_merged.png | Bin 463 -> 0 bytes app/assets/images/event_push.png | Bin 632 -> 0 bytes app/assets/images/list_view_icon.jpg | Bin 357 -> 0 bytes app/assets/stylesheets/sections/events.scss | 24 ++++++++++++-------- app/helpers/events_helper.rb | 11 ++++++++- 15 files changed, 28 insertions(+), 15 deletions(-) delete mode 100644 app/assets/images/diff_file_add.png delete mode 100644 app/assets/images/diff_file_delete.png delete mode 100644 app/assets/images/diff_file_info.png delete mode 100644 app/assets/images/diff_file_notice.png delete mode 100644 app/assets/images/event_filter_comments.png delete mode 100644 app/assets/images/event_filter_merged.png delete mode 100644 app/assets/images/event_filter_push.png delete mode 100644 app/assets/images/event_filter_team.png delete mode 100644 app/assets/images/event_mr_merged.png delete mode 100644 app/assets/images/event_push.png delete mode 100644 app/assets/images/list_view_icon.jpg diff --git a/Gemfile b/Gemfile index 77b05446..20323f2e 100644 --- a/Gemfile +++ b/Gemfile @@ -111,7 +111,7 @@ group :assets do gem "modernizr", "2.6.2" gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git" gem 'bootstrap-sass', "2.2.1.1" - gem "font-awesome-sass-rails", "~> 2.0.0" + gem "font-awesome-sass-rails", "~> 3.0.0" gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' end diff --git a/Gemfile.lock b/Gemfile.lock index 8fba310d..58d51063 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,7 +174,7 @@ GEM eventmachine (>= 0.12.0) ffaker (1.15.0) ffi (1.1.5) - font-awesome-sass-rails (2.0.0.0) + font-awesome-sass-rails (3.0.0.1) railties (>= 3.1.1) sass-rails (>= 3.1.1) foreman (0.60.2) @@ -381,7 +381,7 @@ GEM rspec-mocks (~> 2.12.0) rubyntlm (0.1.1) rubyzip (0.9.9) - sass (3.2.3) + sass (3.2.5) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) @@ -488,7 +488,7 @@ DEPENDENCIES email_spec factory_girl_rails ffaker - font-awesome-sass-rails (~> 2.0.0) + font-awesome-sass-rails (~> 3.0.0) foreman gemoji (~> 1.2.1) git diff --git a/app/assets/images/diff_file_add.png b/app/assets/images/diff_file_add.png deleted file mode 100644 index 0f01128df96a9f03016dd00c0103f80fde14ab72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE-VV{wqX6T`Z5GB1G~wj^(N7l!{J zxM1({$v_d#0*}aI1_o|n5N2eUHAey{$X?><>&kwIiCe^2JfqI@98k#6)5S5w;&gJt z0;7Z@+SRik+PBTns|u~=`-SsdVJYy z_WTfHSX;d4jgIVt-%e@|rd=wDExP+Yw~OJ$^_MfgGK(&EMY06MTyX9Ws|3R$Lq&tH Re=`k1BA%{(F6*2UngA1tW?ldQ diff --git a/app/assets/images/diff_file_info.png b/app/assets/images/diff_file_info.png deleted file mode 100644 index 8529e82396a8868a30dd701d32a1025d5b3bf9f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 749 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipt+ z3N#H9*lAh-00M1EL_t(I%YBo-PZMz%#y{V?@7?zIQ6++x^Bz)ihe0W%YJ~j33E8w3jG|cF+*vPo!G(U+%?hp=N!Bh%> z+Q9)E8)*`WZAZzd)tp8;;;0U3*pOt)SPK6*GXNb2V*OG``S^LYS*!64n;-CV!c z!H1cT6n^L5PE1Tb1za5vLqkLNLZQ&;z`!7%;HF^>)IJ@PkDjs zdStR$gb)Cx1cVTR{c;(ltYhL_Na?d*E+5Yc2_OXQ?UgW1)oAfK5bW)hIQ}C6zgj(5 ztRL2U0s#ll^ZvW8X&U8niE8y=5%48YOQlj{juV({X=wq(xkvtr>$6?hB9%&w0W}@) zGnq`Wz5Qy3dsx323SB}P2D+}Fl#~*~FwixP^|c>tZEd}e$K$Voq7Ha~x4gW(7!HTS z)k@`tQi?#J2~#Ny!$1g)-JNaL*H+ow{53N@J^cd60hMFPb>ISUITDH7?dJm2|%HBo-U3d8Ta1a zILmp+LB#c;@aNB)~F}Qe@kQ+6EJ`0lAN$cG0l*3&hGvE`zrHIJvkaJ z(+{3ec4%N=WMbhEPyjQMRHcLS{5-kexb;-b(NC1;W%zQOdCJcZkA8D+x30ay%do~< zA%%ZFvd+H}5%P*%nJJnxtKFX-kwF)N#W%SAbZkJ*7JhO=Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyw< z5E>e|PZtIN00M4FL_t(Y$F-GBh>lSd$AAB~x1o&kvA{yc*1|}N#iWsh)hv_+&m9XE zLXsjZrYtm?Qj$VR={#9j84Dj%YFH_=o5{*Xp?u_HiWt)z3-_7s`*eLY!>Omz+%~gI(*#9Ptd}$hEMXSr z-jevqvMkRkgdpIeyC0C$vOWrMcYh6xNqPW$0y=@sz%qBAC&`nFRQuk$`>JNF`I?Lx zNg4;vNjh(44d?3&8%Q$v+9|;4y>I8sR|l8{l{pb{MD# zKF3%KU^9CirR6okeo3F){e+~sz;#J)fG5eac{#D!5&=D_Q&$HIcjF<1&<5Oc_wC6=t8i8{ zV%NXddLVb7V%A(%{_9bHlU>vvxJOgf; z*;_Kh>8~w>&<)%N+F~Zp&1_}v1)7nW*)XsLcvs8h-w;HSN5BqupZL`~J}ZKXMABAZ glK*KTgw9<22g1kw?GASPt^fc407*qoM6N<$g1Qw^R{#J2 diff --git a/app/assets/images/event_filter_merged.png b/app/assets/images/event_filter_merged.png deleted file mode 100644 index 30aea0b6e55985cc8e881d952d1f4282cc80a046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 463 zcmV;=0WkiFP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye{ z2@)MQM<#Fp00B=)L_t(I%iWW)N&`U>B?r-G$o6;>qnTBxX}7J`_wnZUB-%q4aXEZoff`|bRG>s4j@B>kWXKTjC0O|k$002ovPDHLk FV1kZ7yrKXA diff --git a/app/assets/images/event_filter_push.png b/app/assets/images/event_filter_push.png deleted file mode 100644 index 930faee6aa2a441ab0805910cf815212f95cfe83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmV-;0*C#HP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye{ z2@)=dmq%s*00H<(L_t(I%dOPEYZOrs2k_5rB!qySkQ9rWUSc5#Tck)33yF|2!Y#qG zNm8Xxy88ptd5wwDhdL)eaTyKl;~k!2x6HHe)whirusJ-#2oCWWUG#7jO^o3f3uT_YI1w-n#X45- z2JJG>-k(sxHLPI{oifjs>w?zPQ1sGJEY;j4X()zj{H-(;f6`EN`o3hK%oQw`dDf{( z>H!{Aon@YFqJ_mY6isME0zTtynP;;#Smm4Gx9<9Hd_?OPAe(@0wKX}6#Cj3vRjQL?IdvpEnqGUMXM6{6W{P9 zp0CkYRnk0`$~-%23|!pDB3gs;iqafp|3?Mv3AV~SyH~fqIuZ1BTwmQ&dbS!f+w6m# zv|yXqh>F;c3g|D`$=IHW*t4ZF&o)lo*b($Rrs6ow#0?Dx*hauknP*4Uw|@aR*tis< Sh#*h^0000002t}0ssI2w=C_w00001b5ch_0Itp) z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyw< z5&{UyX)1XD00g;7L_t(|+TB~rZt5@)C5}TvLWo<0D4=#j|NnQoVON1lQ4vY=bnN&p zA|Z4Gf#5L>%&v$UAJ5~=jK|tyvFJRspw6Sq<0Hhk`5Df6Q52kWA;kVeP1AH;M+oV< zey<3H5R}q9&kuneN}lH>RMRvK!?-hqS(Z^si=w#X%W)j*x^5VTX_|L{PzVvnF=MQ$ zC3DUhW43K;n%3S(BZP>es42X?Fvg-NI<#uedAks%X)3uV&UqZi`#&Y)5C&1&-l!<0 zS(eGKndf7n(+zroCS8k9BzHB$DoT zH0rd7Ef`}U9(X8}QpOm@_>cW??=~u^Reo78gy1F$wJZV*42sgDw)o+Hb;G0SPza$; zhmtG9=&&dXMF`8qWfC_S9U_D%r7GYt#t=e(Z>43mu1JTHl@wT{!5FI`3`x3&WDCo( zRJfviUWx&?;`=_Vt#Z!)KJ$jEQ`IetTIDk;P7QKTmSr7wALOOm?Y5%E-;3iofZ?<# z3deEUg%Fl77-N=YwF@DXUBP-aaBKi{MX199)}iA#aKt+rCe7!*SIdke!b z_l)Io8*DjkB@7$mQ%K!`Dx>3_p! z@Je*p@At2EMInT3+igeay6)ANDruS$LLd#QqeeW>3&XG}r*X~)g8^(Yt!iRuG#XvO zib;~Zyu85fL={3^*WcdWeBZzD&a@~B-}hf%U%|T}3a7q2&zsF=zVDX9d zo56Y@ydS1%`d=b>I`@3GRd%YeZL?*?NMHq(R zZnxXt)M}bGolZ{`K53ffc^*Yk$(c1XUP+RyR;zuDVp$d;q~Gt~4q-X?^z-vmt#@@@ zpUq}6X&0q*xm;Fr28{7=IPCZPjgsER2!#+q5Nx;G8csJ1V>+E)2a-}++H*}#_w@AS zy6%Nhw*f-Vc@PA<-R_cn1tByZkDJ<67>4Wh`VxXc2oXXEA!l)3iZBer&1TcI2QwH9 zo}ZsDQ6{ByyWIvs(2VO48V-kqkQ%!^k1)^k@9*z2JY3h0ux)!V7}&O5J@0ZzF9?D- zj<4>0bi3WjWO6EKok5tU>2kRQnN2FUQjP<6I-M-b$_Zka#08JVmG_WAj# zXix@RN}{TQL^W|`wOZW^yfVmteSK9ojA~M0MT1=GB+v6|9L6=Arfy0`of@kH|8=#6 zqUQnXELamj@e~Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye{ z2@)MQM<#Fp00B=)L_t(I%iWW)N&`U>B?r-G$o6;>qnTBxX}7J`_wnZUB-%q4aXEZoff`|bRG>s4j@B>kWXKTjC0O|k$002ovPDHLk FV1kZ7yrKXA diff --git a/app/assets/images/event_push.png b/app/assets/images/event_push.png deleted file mode 100644 index 930faee6aa2a441ab0805910cf815212f95cfe83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmV-;0*C#HP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iye{ z2@)=dmq%s*00H<(L_t(I%dOPEYZOrs2k_5rB!qySkQ9rWUSc5#Tck)33yF|2!Y#qG zNm8Xxy88ptd5wwDhdL)eaTyKl;~k!2x6HHe)whirusJ-#2oCWWUG#7jO^o3f3uT_YI1w-n#X45- z2JJG>-k(sxHLPI{oifjs>w?zPQ1sGJEY;j4X()zj{H-(;f6`EN`o3hK%oQw`dDf{( z>H!{Aon@YFqJ_mY6isME0zTtynP;;#Smm4Gx9<9Hd_?OPAe(@0wKX}6#Cj3vRjQL?IdvpEnqGUMXM6{6W{P9 zp0CkYRnk0`$~-%23|!pDB3gs;iqafp|3?Mv3AV~SyH~fqIuZ1BTwmQ&dbS!f+w6m# zv|yXqh>F;c3g|D`$=IHW*t4ZF&o)lo*b($Rrs6ow#0?Dx*hauknP*4Uw|@aR*tis< Sh#*h^0000^lOiET&UP@Y7ModgWM?qOlT~kX_QeM|USHnP6LsNs1ot>SFgG-o;OISln zOiF`f@c#gVAO`~ tooltip do - image_tag "event_filter_#{key}.png" + content_tag :i, nil, class: icon_for_event[key] end end end + + def icon_for_event + { + EventFilter.push => "icon-upload-alt", + EventFilter.merged => "icon-check", + EventFilter.comments => "icon-comments", + EventFilter.team => "icon-user", + } + end end