Merge pull request #2314 from Pistos/svg-to-png

Converted all [used] SVG graphics to PNG.

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.svg", :height => 12, :title => t('.edit_aspect', :name => aspect.name)), edit_aspect_path(aspect), :rel => "facebox"
+            = link_to image_tag("icons/pencil.png", :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
 

app/views/authorizations/new.html.haml

@@ -26,7 +26,7 @@
       - elsif scope == "AS_photo:post"
         %li
           .scope-photo
-            = image_tag('/images/icons/photo.svg', :title => "Cubbies will be able to post photos on your behalf")
+            = image_tag('/images/icons/photo.png', :title => "Cubbies will be able to post photos on your behalf")
 
           .scope-description
             %strong

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.svg', :height => 16, :alt => t('_home')
+          = image_tag 'icons/home_grey.png', :alt => t('_home')
 
       #notification_badge.badge
         = link_to notifications_path, :title => new_notification_text(@notification_count) do
-          = image_tag 'icons/notifications_grey.svg', :height => 16, :id => "notification-flag", :alt => new_notification_text(@notification_count)
+          = image_tag 'icons/notifications_grey.png', :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.svg', :width => 18, :alt => new_message_text(@unread_message_count)
+          = image_tag 'icons/mail_grey.png', :alt => new_message_text(@unread_message_count)
           .badge_count{:class => ("hidden" if @unread_message_count == 0)}
             = @unread_message_count
 

app/views/likes/_likes_container.haml

@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 - if likes_count > 0
-  = image_tag('icons/heart.svg')
+  = image_tag('icons/heart.png')
   - 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

app/views/shared/_publisher.html.haml

@@ -40,7 +40,7 @@
             = status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit'
 
             #file-upload{:title => t('.upload_photos')}
-              = image_tag 'icons/camera.svg', :height => 14
+              = image_tag 'icons/camera.png'
 
       - if publisher_public
         = hidden_field_tag 'aspect_ids[]', "public"

config/locales/diaspora/en.yml

@@ -877,7 +877,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"

graphics/README.md

@@ -0,0 +1,5 @@
+The files in this directory are "source" files for the graphics used in
+the Diaspora frontend.  This includes GIMP files, Photoshop files, SVG
+files, and all other image files of this sort.  They are not shown directly
+to end users, but are used to generate the actual graphics used in the
+frontend (PNGs, etc.).  They can be scaled, tinted, shaded, etc.