Replace files icons with fontawesome

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

12 files changed, 13 insertions, 5 deletions

diff --git a/app/assets/images/Storage-UI.PNG b/app/assets/images/Storage-UI.PNG
deleted file mode 100644
index 8ab6678de32..00000000000
--- a/app/assets/images/Storage-UI.PNG
+++ /dev/null
diff --git a/app/assets/images/file_bin.png b/app/assets/images/file_bin.png
deleted file mode 100644
index b3feafcce0b..00000000000
--- a/app/assets/images/file_bin.png
+++ /dev/null
diff --git a/app/assets/images/file_dir.png b/app/assets/images/file_dir.png
deleted file mode 100644
index ea277bb14db..00000000000
--- a/app/assets/images/file_dir.png
+++ /dev/null
diff --git a/app/assets/images/file_empty.png b/app/assets/images/file_empty.png
deleted file mode 100644
index 2e85bb48737..00000000000
--- a/app/assets/images/file_empty.png
+++ /dev/null
diff --git a/app/assets/images/file_img.png b/app/assets/images/file_img.png
deleted file mode 100644
index ca554c5aefe..00000000000
--- a/app/assets/images/file_img.png
+++ /dev/null
diff --git a/app/assets/images/file_txt.png b/app/assets/images/file_txt.png
deleted file mode 100644
index b3230b5add0..00000000000
--- a/app/assets/images/file_txt.png
+++ /dev/null
diff --git a/app/assets/images/rss_ui.png b/app/assets/images/rss_ui.png
deleted file mode 100644
index c45afbab519..00000000000
--- a/app/assets/images/rss_ui.png
+++ /dev/null
diff --git a/app/assets/images/submodule.png b/app/assets/images/submodule.png
deleted file mode 100644
index 62a88cc619b..00000000000
--- a/app/assets/images/submodule.png
+++ /dev/null
diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss
index db177a0083c..b0ce78ddb35 100644
--- a/app/assets/stylesheets/sections/tree.scss
+++ b/app/assets/stylesheets/sections/tree.scss
@@ -57,6 +57,10 @@
         }
       }
 
+      i {
+        color: $bg_primary;
+      }
+
       img {
         position: relative;
         top:-1px;
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index f39d0081dce..2d82b6a0b47 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -25,8 +25,13 @@ module TreeHelper
   #
   # type - String type of the tree item; either 'folder' or 'file'
   def tree_icon(type)
-    image = type == 'folder' ? 'file_dir.png' : 'file_txt.png'
-    image_tag(image, size: '16x16')
+    icon_class = if type == 'folder'
+                   'icon-folder-close'
+                 else
+                   'icon-file-alt'
+                 end
+
+    content_tag :i, nil, class: icon_class
   end
 
   def tree_hex_class(content)
diff --git a/app/views/projects/tree/_submodule_item.html.haml b/app/views/projects/tree/_submodule_item.html.haml
index ae87dbde67a..3e2655cc4f6 100644
--- a/app/views/projects/tree/_submodule_item.html.haml
+++ b/app/views/projects/tree/_submodule_item.html.haml
@@ -1,7 +1,7 @@
 - tree, commit = submodule_links(submodule_item)
 %tr{ class: "tree-item" }
   %td.tree-item-file-name
-    = image_tag "submodule.png"
+    %i.icon-archive
     %span
       = link_to truncate(submodule_item.name, length: 40), tree
     @
diff --git a/app/views/projects/tree/_tree.html.haml b/app/views/projects/tree/_tree.html.haml
index 1fc06928bcf..49c9edffc66 100644
--- a/app/views/projects/tree/_tree.html.haml
+++ b/app/views/projects/tree/_tree.html.haml
@@ -36,8 +36,7 @@
     - if @path.present?
       %tr.tree-item
         %td.tree-item-file-name
-          = image_tag "file_empty.png", size: '16x16'
-          = link_to "..", project_tree_path(@project, up_dir_path(tree))
+          = link_to "..", project_tree_path(@project, up_dir_path(tree)), class: 'prepend-left-10'
         %td
         %td
         %td