From a6d27e2bb5af28f479d181512f6253dd43b057a4 Mon Sep 17 00:00:00 2001 From: Pistos Date: Thu, 3 Nov 2011 23:54:23 -0400 Subject: [PATCH] Revert "Converted all [used] SVG graphics to PNG. Sized as they are rendered in actual practice." This reverts commit 5c8ddc3ea6d33e84295fe49939df89e8e2eb3fa5. --- app/views/aspects/_aspect_listings.haml | 2 +- app/views/authorizations/new.html.haml | 2 +- app/views/layouts/_header.html.haml | 6 +- app/views/likes/_likes_container.haml | 2 +- app/views/shared/_publisher.html.haml | 4 +- config/locales/diaspora/en.yml | 2 +- public/images/icons/camera.png | Bin 1217 -> 0 bytes public/images/icons/camera.svg | 12 ++++ public/images/icons/heart.png | Bin 775 -> 2935 bytes public/images/icons/heart.svg | 9 +++ public/images/icons/home_grey.png | Bin 1371 -> 0 bytes public/images/icons/home_grey.svg | 50 +++++++++++++++++ public/images/icons/mail_grey.png | Bin 898 -> 0 bytes public/images/icons/mail_grey.svg | 54 ++++++++++++++++++ public/images/icons/notifications_grey.png | Bin 1179 -> 0 bytes public/images/icons/notifications_grey.svg | 62 +++++++++++++++++++++ public/images/icons/pencil.png | Bin 727 -> 0 bytes public/images/icons/pencil.svg | 10 ++++ public/images/icons/photo.png | Bin 2801 -> 0 bytes public/images/icons/photo.svg | 14 +++++ 20 files changed, 220 insertions(+), 9 deletions(-) delete mode 100644 public/images/icons/camera.png create mode 100755 public/images/icons/camera.svg create mode 100755 public/images/icons/heart.svg delete mode 100644 public/images/icons/home_grey.png create mode 100644 public/images/icons/home_grey.svg delete mode 100644 public/images/icons/mail_grey.png create mode 100644 public/images/icons/mail_grey.svg delete mode 100644 public/images/icons/notifications_grey.png create mode 100644 public/images/icons/notifications_grey.svg delete mode 100644 public/images/icons/pencil.png create mode 100755 public/images/icons/pencil.svg delete mode 100644 public/images/icons/photo.png create mode 100644 public/images/icons/photo.svg diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml index bfd2cc43d..9752b1623 100644 --- a/app/views/aspects/_aspect_listings.haml +++ b/app/views/aspects/_aspect_listings.haml @@ -13,7 +13,7 @@ - for aspect in all_aspects %li{:data => {:aspect_id => aspect.id}, :class => ("active" if defined?(stream) && stream.aspect_ids.include?(aspect.id))} .edit - = link_to image_tag("icons/pencil.png", :title => t('.edit_aspect', :name => aspect.name)), edit_aspect_path(aspect), :rel => "facebox" + = link_to image_tag("icons/pencil.svg", :height => 12, :title => t('.edit_aspect', :name => aspect.name)), edit_aspect_path(aspect), :rel => "facebox" %a.aspect_selector{:href => aspects_path("a_ids[]" => aspect.id), :class => "name", 'data-guid' => aspect.id} = aspect diff --git a/app/views/authorizations/new.html.haml b/app/views/authorizations/new.html.haml index 07bfcadb3..4bb6ee00d 100644 --- a/app/views/authorizations/new.html.haml +++ b/app/views/authorizations/new.html.haml @@ -26,7 +26,7 @@ - elsif scope == "AS_photo:post" %li .scope-photo - = image_tag('/images/icons/photo.png', :title => "Cubbies will be able to post photos on your behalf") + = image_tag('/images/icons/photo.svg', :title => "Cubbies will be able to post photos on your behalf") .scope-description %strong diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 2f2027c73..923013d72 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -24,17 +24,17 @@ #nav_badges #home_badge.badge = link_to multi_path, :title => t('_home') do - = image_tag 'icons/home_grey.png', :alt => t('_home') + = image_tag 'icons/home_grey.svg', :height => 16, :alt => t('_home') #notification_badge.badge = link_to notifications_path, :title => new_notification_text(@notification_count) do - = image_tag 'icons/notifications_grey.png', :id => "notification-flag", :alt => new_notification_text(@notification_count) + = image_tag 'icons/notifications_grey.svg', :height => 16, :id => "notification-flag", :alt => new_notification_text(@notification_count) .badge_count{:class => ("hidden" if @notification_count == 0)} = @notification_count #message_inbox_badge.badge = link_to conversations_path, :title => new_message_text(@unread_message_count) do - = image_tag 'icons/mail_grey.png', :alt => new_message_text(@unread_message_count) + = image_tag 'icons/mail_grey.svg', :width => 18, :alt => new_message_text(@unread_message_count) .badge_count{:class => ("hidden" if @unread_message_count == 0)} = @unread_message_count diff --git a/app/views/likes/_likes_container.haml b/app/views/likes/_likes_container.haml index 1c175bf55..aeda12159 100644 --- a/app/views/likes/_likes_container.haml +++ b/app/views/likes/_likes_container.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. - if likes_count > 0 - = image_tag('icons/heart.png') + = image_tag('icons/heart.svg') - if target_type == "Comment" = link_to t('likes.likes.people_like_this_comment', :count => likes_count), comment_likes_path(target_id), :class => "expand_likes" - else diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml index c0a5b361a..20982f675 100644 --- a/app/views/shared/_publisher.html.haml +++ b/app/views/shared/_publisher.html.haml @@ -17,7 +17,7 @@ -if publisher_explain :javascript - $(document).ready(function() + $(document).ready(function() { $("#publisher .dropdown").popover({trigger: 'manual', offset: 10, placement:'below'}); $("#publisher .dropdown").bind("click", function(){$(this).popover("hide")}); @@ -61,7 +61,7 @@ = status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit' #file-upload{:title => t('.upload_photos')} - = image_tag 'icons/camera.png' + = image_tag 'icons/camera.svg', :height => 14 - if publisher_public = hidden_field_tag 'aspect_ids[]', "public" diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 3c48a5379..d1f4d555c 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -865,7 +865,7 @@ en: recently: "recently:" commented_on: "commented on" posted: "posted" - community_spotlight_stream: "Community Spotlight" + community_spotlight_stream: "Community Spotlight" aspects_stream: "Aspects" mentioned_stream: "@Mentions" followed_tags_stream: "#Followed Tags" diff --git a/public/images/icons/camera.png b/public/images/icons/camera.png deleted file mode 100644 index cc4d3bd54fe2f1c9f57d342bfc6da111bc6418d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1217 zcmeAS@N?(olHy`uVBq!ia0vp^!a&T&!3HGHN~m`NDaPU;cPEB*=VV?2Ic!PZ?k)`f zL2$v|<&%LToCO|{#X#-XL734=V|E2lkiEpy*OmP?Hw&|Z=FInx<}xs_IC{D`hFAzP znz5Yx4OD>@Fakwq0P#m4{*Qz~{OLdpk|!EC0aYR!g3flpWs(d~Vk;1T0b+Db#PC7- zwg9m-$hkX!*d2(mf$u;;ko;>P76W1rAm#vKY+yS`5TpT{3-$xWr9cXRfEPkBNCWAE zK#Wa2$Q-N^cYxv`1A>A01ys#*APq_wAn|)pF?2(*8kPZ6tO>+F(KP)4^3{Pj3r!qs zC=*Z+8#ngTe~DWM4f@H(MP diff --git a/public/images/icons/camera.svg b/public/images/icons/camera.svg new file mode 100755 index 000000000..147f29fde --- /dev/null +++ b/public/images/icons/camera.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/public/images/icons/heart.png b/public/images/icons/heart.png index 4e28f1220d4dd31b6e23cb138ce56e155f8765cf..18701ba41198464d04b815438588d0eefd4d00e5 100644 GIT binary patch literal 2935 zcmV--3yAcIP)4Tx0C)kNmUmQBSrfqTdoR7v5<-y@dJRoV0Fe@U zkzPe5BmqJR7!t5oLbpCc6H zqI?@={d8%D5al;0(=!CzYydD6nO!2_rJ!tuGDRE_#zA==00c_%EKZ!o62USwPXIWX zS zj`sE}8w<4jU*%sHzk2;U$a?$5<7MdQoaVsz{O95^ejS$UX;36cb2fe1Y+3Y{{cC>d?H zh%b}~Geu0H=$|_LAH!zlAj2Q0Uf9TEuaUC0Snjw z2jC3cfEVxw!5{*}g2jLbQa}a}gIur*tOxm^5bOYZKsl%aHJ}bOfD@nvoCX)bWpEwb z1byH>7z88W8JGmG!3+dJc!&zoAT>xEGJwn=8;A|fhrFObC=7~)5};&A1WBP)&_<{b zDu&9TgHRpxBXkP709}Q8pu5lzG!Fdvq zf1r2MCzX|yZIz>xmnl~$pHUuUAPhr>A0wSn#5lp|XS`F#WweHcflJworSw_BrjROl77! zGo4w=>|jpnXz2LrNOcbCbnDFM8tF#rZqRMieW*v$W9ud9?bd78o7C6V57J+yU$1}9 zfM~!rNHN%J&}lGjXk-{|xY@A9aLh>6$j@knQN7UvW2&*M@lxYz|7l}t!?UTdxjmOU*L&{Txvg_w*qYf2Z1>yV zv7^}q*=@FKxBFo4U@x|Bupf8OcSvxkbQoaM*&*z0>?@8~M-Rufj;9^pI@vo(oK86X z;mmSQb3W=kHqU6DU|!9%Av^?0i=GocG20 z2Kesu9q`liwb@YiqU=@)9sQZ=k{U}lNr!Ug=Tzjp$&JcAxlD1HXj#{C)8$*2 zkFM}u@%>87O5V!$RXVHIuNqqIzWU%AXiegp_O*Iz^VW{6^I3OfJ!yT~`d>C!Z7AOG zYGd@qwmi+eb$P>^d^XkR%jJvn2R1uzuG)gxBHYrwb?(-(tse{c1=k9#3QG##Z{uyd z_MP>2rQdzpp0vHY$i8U*4%`mWj{cplJC77A7OyBC-W9Z~c{g)+!R}Xkmh8D&Vp~$R zm$X;9cd#_Dw6#pXY)9Gq@|5zv3Xh7$N{z~`mDBt9`+E1g?Qf{ktSYQ}cR+aH&Ox7p z&DDn0C5Lc_at=MIiK^-Rp8b7Yt$J-??T5pn!-Ge{j&#&H)YTo;I9gN>*GucikHsIm z`Ge;VtqrV(gN=;F!sFn$^!U>s6MpPJ5pbgYB>QB;PX<3#Hqn|2nxW?9&66!DErYGG ztv#pwPqnu>w>AB2@$=!+I;ShnD4!`hOFEl(_S3l)=cdkQou9and||kKN&EeaF&A%l zgm!da3b=ITviIeSo$j6IuDDz|ebwpescYO08?84T zZ?^T!>p9!&+I!)a=dH`P{cd0HThQ0jAK8CrAbw!*4*$;B-SoRJ?&aK@xxelK_Cdiz zg@+}NG#*v|YVvF2p#9*PAK5^Wa`oDjMp>M z1#i^e9C^!r+xaf~-RMm2d;I&-4<;YlJ_dYz@G0Zdr@sILoAdna&gY5%000SaNLh0L z01m_e01m_fl`9S#0002WNklK z?RltPAjQBS0K}lUCDss-W)UDp0mK@DRWr;aLWbbgjBE(DFd<4a%n=JzD?(002ovPDHLkV1j`ZmxllV literal 775 zcmeAS@N?(olHy`uVBq!ia0vp@K+MCz1|)ZGH@^v_7>k44ofy`glX(f`uqAoByDx`7I;J!1GQZTVMZs7*%d%R_7YEDSN7Z7EX>M^dn7G$7#Nt^JzX3_G(;I| zn413rRe(VXkh}!MZ-Dp^5ZeGT2-pJgVIT&HUj*W0AO?dZAo(8+e+TkofEYxh%f$o5 z7=SLrkU&?6%)iPA)bI_6If0m1@Qn$m@)ohGq3UjeG|eSZ(;Sd`W+2`T#K`W(#oh%} z2eJqZB!MI-R&gl?iGu=69EeeX6p(iwh_Pur3ls+#j1_PIMVA9Hvc_dVK08*`NP;Xt r_6i^dX + + + + + diff --git a/public/images/icons/home_grey.png b/public/images/icons/home_grey.png deleted file mode 100644 index 91a8ef28d297abcad5e951403146d0a73d0bc7da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1371 zcmb_cy-Pw-6o1cNTBf0d4$>b`X*J}~+UtovA_-|J8q6VD)WC+Og0@CKaA|Q6+MFB& zF&Z2zf{X^I+QPtwK8Qg39r4NaX-qYf-#Pc(%R5=~x{Z39p5r*9?2&ws6WFE^ zE&gANQUHRF_}n6wxt@H2p$)9KC9Y1tRN*WR&*+|KBZBmM+PpY*dH|%{_1%tucUf`Z&(P-46(P+*=V8O1` zYBez&4wq0shHXHRi%=+3Q40J>)+8zbXjQBNCK3rdfNCOw zSU^Pnu6Y`kgmfIi38ErYwj&ls{*F8Xv^it3*bIDGY!d~4v4&YpYi5|y0*;VJ(98n* z=r4%7aLbp3Yjl=OCg*VVIoN+8qI^0*o*E&8r*{NNL#68;n+qVP+1>>-t_;!sdIU0XtEBnT@ISwx^*El8qx|@yZWKc8jyV yzGN)8pZ>38t(jpqRm`NSu8uFoThsRr*%7BaB`5m1Yx7U + + +image/svg+xml + + \ No newline at end of file diff --git a/public/images/icons/mail_grey.png b/public/images/icons/mail_grey.png deleted file mode 100644 index 3f503af5337413e358b57c93fdd1b432c0cefbd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 898 zcmeAS@N?(olHy`uVBq!ia0vp^fPW3AYTI}2XYBA07;wz8XyPst09mL^B&mw zAaP(Ag2dnkfHcEh0^&dc2auk?%*<>I^sgV#>0v;dR{`lBkZWOzkZE+6z~w+1fUemE zbpAaMjmrR#25c^Y8w6zN1HG^nSpXXwr%SLY#w7+asTe$6 L{an^LB{Ts5-*9`` diff --git a/public/images/icons/mail_grey.svg b/public/images/icons/mail_grey.svg new file mode 100644 index 000000000..da935a95d --- /dev/null +++ b/public/images/icons/mail_grey.svg @@ -0,0 +1,54 @@ + + + +image/svg+xml + + + \ No newline at end of file diff --git a/public/images/icons/notifications_grey.png b/public/images/icons/notifications_grey.png deleted file mode 100644 index 78ad7c77977cb6286a73538ba86a54baba508e73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1179 zcmZvbTS(J!6vzMn|JE*wvE~?k{D)HWR&ba_d72+9Y+ zZHW{iL@IkQq$rZgpa{AUL_|UMQcn{vkX_X2*5~|Tqm^fz|G9t9@0{OnR~o%F1$k@p z6h$fU)ViCIHerj2Z|PjR1)+8}*SM6CwaAQXFLtn=Fj;?!#Y!E^7%tWF&2B=Rr`0WQEkTAq)JK-_4f8QXqwjSbUIJ^e7@zJ z;0lKJw=WWjcvV#$NT<_V5{bmEcsy?SJHC>h1)%d05^excolGWoqdNc@#cy7zFyqrl zkR%E}(0Qz_t?je~ySuydtyb$@e3S68R4Qc)hr_bG9LnwhkPU!5AsP#XLRTfLzrR0k zadB}H^(X9vqr^hUEM-Ta^B04`P(>sVjYiK(#?sPK1;PkRu~4wDuP>wPj_e6^iw}!j zj~IvLxMlEaI774Sr?{h|<9EjKAAkfHr<`%#p-T4*B~cdOM<$cW=lA=?Ry2~Y$*gp4 zLEoc0HLVDlEe33kMed`!6IsAshN)Sl=MropP=c|E2UI6cd@m6bqC;Fj>JvM9CPz1$ z&0c(VKyG(+bs04fC3!DJqv(g_`T~K#5AbKpper2x*Zll^J!+}L;TWK) zHb`=CYHI2=&M}L{a;K-K$41BR?d|R3+}eA9DgkL_%!>j-&UVB`{6i|o&_H?x$i3<5 z>C1MzJw|c^3Bx4B0eK-su~s?Az7pJtT@T0`I+O!?ljYu*qznP_jaUU^J;?ZS-hqt6 m2#o{}&_w_TN!DLwrr=+BYP0$2uHyPq@q4Ph?h)7VOMd_apemvO diff --git a/public/images/icons/notifications_grey.svg b/public/images/icons/notifications_grey.svg new file mode 100644 index 000000000..e4a227af0 --- /dev/null +++ b/public/images/icons/notifications_grey.svg @@ -0,0 +1,62 @@ + + + +image/svg+xml + + + + + + diff --git a/public/images/icons/pencil.png b/public/images/icons/pencil.png deleted file mode 100644 index d2687a2eb10e79b89d5bd46c247ebb69becebe0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 727 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}Y)RhkE)4%c zaKYZ?lYt_f1s;*bK<(E-n9)gNb_Gz7y~NYkmHjq13$um*pYema3=B-+o-U3d8lsFo zOq>4#RWSGg@iQR41;nC2Ob~z+gLEbVu@Mk^0Wn^14=9@m#AZPJ0f>JAaUc-m1R_8g z6Ci#M#Q&j~peApi!k&L=)8H0aWxI zNz-p2`!Eoz05MMB29)^*#30j~fmjHLn}8TEa0SX90Ag5V_5j%&j6eb(Pyk9M12HJo m2?FsxLK=W-zyOqFqk-7?NUG)>-PaCNK%$Qm diff --git a/public/images/icons/pencil.svg b/public/images/icons/pencil.svg new file mode 100755 index 000000000..1a277dd50 --- /dev/null +++ b/public/images/icons/pencil.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/public/images/icons/photo.png b/public/images/icons/photo.png deleted file mode 100644 index 6032a0cd0f1aaa7bcd98896404a35431b285144c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2801 zcmeAS@N?(olHy`uVBq!ia0vp^azHG`!3HF+C+nOCQjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?i-Fp&gD|6$#_S59AbW|YuPgg)ZWd-W#e;cgH5nMV3O!vMLp*pH z)3|1SWdthu55#l_Omw#qY9R}f#Sek(<4Am3FfD1vLmSfeFx%2H63&kJz9F zr3En(9i$3WZvn(0y%>O4i@kw5cK|Ubh6&gOK6ZO+ai2#Gs(U z>I0xSG63aDSo#S^mVmK|vDgEs7-T63fD9}Jv+xt3&;i9I2yBB;m?WXZ1qv>h8W8;# zh&?fl!4NTqs$)iyfhR7I7|c+RAUbdY3c%!%>9;^}Wpu?v@ZlB{3TjZ{hYbh;1y=wu z2bv@({%z63uyXNP3^KqKt1gJ336NR}#IVFB0Az0k;)6gO2E+sbEC|tqdNWWbOb#EN z3sk2F#21m&e*m&IfEXRXgBm0OGZfik1EBanBsrKGZ1gXnI#8UW%KFjt)RRUIWC)sT!^Zo5i|7S%0_+$`~#{?QPhMz-DnJP$99t z#bzeDSQ$_t5?zo5O#sBd2gIFd;*@ehc^<`+=obG0DyX5<7Gm^+f)tb*LEsS(p8~UJ uN0 + + + + + + +