Replace files icons with fontawesome

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

Replace files icons with fontawesome
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 31c963ed
Showing 12 changed files with 13 additions and 5 deletions Show diff stats
app/assets/images/Storage-UI.PNG
app/assets/images/file_bin.png
app/assets/images/file_dir.png
app/assets/images/file_empty.png
app/assets/images/file_img.png
app/assets/images/file_txt.png
app/assets/images/rss_ui.png
app/assets/images/submodule.png
app/assets/stylesheets/sections/tree.scss
app/helpers/tree_helper.rb
app/views/projects/tree/_submodule_item.html.haml
app/views/projects/tree/_tree.html.haml
@@ -57,6 +57,10 @@
         }
       }
  
+      i {
+        color: $bg_primary;
+      }
+
       img {
         position: relative;
         top:-1px;
@@ -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)
 - 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
     @
@@ -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
...	...	@@ -57,6 +57,10 @@
57	57	}
58	58	}
59	59
	60	+ i {
	61	+ color: $bg_primary;
	62	+ }
	63	+
60	64	img {
61	65	position: relative;
62	66	top:-1px;
...	...
...	...	@@ -25,8 +25,13 @@ module TreeHelper
25	25	#
26	26	# type - String type of the tree item; either 'folder' or 'file'
27	27	def tree_icon(type)
28		- image = type == 'folder' ? 'file_dir.png' : 'file_txt.png'
29		- image_tag(image, size: '16x16')
	28	+ icon_class = if type == 'folder'
	29	+ 'icon-folder-close'
	30	+ else
	31	+ 'icon-file-alt'
	32	+ end
	33	+
	34	+ content_tag :i, nil, class: icon_class
30	35	end
31	36
32	37	def tree_hex_class(content)
...	...
1	1	- tree, commit = submodule_links(submodule_item)
2	2	%tr{ class: "tree-item" }
3	3	%td.tree-item-file-name
4		- = image_tag "submodule.png"
	4	+ %i.icon-archive
5	5	%span
6	6	= link_to truncate(submodule_item.name, length: 40), tree
7	7	@
...	...
...	...	@@ -36,8 +36,7 @@
36	36	- if @path.present?
37	37	%tr.tree-item
38	38	%td.tree-item-file-name
39		- = image_tag "file_empty.png", size: '16x16'
40		- = link_to "..", project_tree_path(@project, up_dir_path(tree))
	39	+ = link_to "..", project_tree_path(@project, up_dir_path(tree)), class: 'prepend-left-10'
41	40	%td
42	41	%td
43	42	%td
...	...