diff --git a/app/assets/images/Storage-UI.PNG b/app/assets/images/Storage-UI.PNG deleted file mode 100644 index 8ab6678..0000000 Binary files a/app/assets/images/Storage-UI.PNG and /dev/null differ diff --git a/app/assets/images/file_bin.png b/app/assets/images/file_bin.png deleted file mode 100644 index b3feafc..0000000 Binary files a/app/assets/images/file_bin.png and /dev/null differ diff --git a/app/assets/images/file_dir.png b/app/assets/images/file_dir.png deleted file mode 100644 index ea277bb..0000000 Binary files a/app/assets/images/file_dir.png and /dev/null differ diff --git a/app/assets/images/file_empty.png b/app/assets/images/file_empty.png deleted file mode 100644 index 2e85bb4..0000000 Binary files a/app/assets/images/file_empty.png and /dev/null differ diff --git a/app/assets/images/file_img.png b/app/assets/images/file_img.png deleted file mode 100644 index ca554c5..0000000 Binary files a/app/assets/images/file_img.png and /dev/null differ diff --git a/app/assets/images/file_txt.png b/app/assets/images/file_txt.png deleted file mode 100644 index b3230b5..0000000 Binary files a/app/assets/images/file_txt.png and /dev/null differ diff --git a/app/assets/images/rss_ui.png b/app/assets/images/rss_ui.png deleted file mode 100644 index c45afba..0000000 Binary files a/app/assets/images/rss_ui.png and /dev/null differ diff --git a/app/assets/images/submodule.png b/app/assets/images/submodule.png deleted file mode 100644 index 62a88cc..0000000 Binary files a/app/assets/images/submodule.png and /dev/null differ diff --git a/app/assets/stylesheets/sections/tree.scss b/app/assets/stylesheets/sections/tree.scss index db177a0..b0ce78d 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 f39d008..2d82b6a 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 ae87dbd..3e2655c 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 1fc0692..49c9edf 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 -- libgit2 0.21.2