tree browse -> file icons

12 files changed, 10 insertions, 5 deletions

diff --git a/app/assets/images/comment_add.png b/app/assets/images/comment_add.png
index 010da964482..98291d0d2ec 100644
--- a/app/assets/images/comment_add.png
+++ b/app/assets/images/comment_add.png
diff --git a/app/assets/images/download.png b/app/assets/images/download.png
index 50f672c5480..d718e07dea3 100644
--- a/app/assets/images/download.png
+++ b/app/assets/images/download.png
diff --git a/app/assets/images/file_bin.png b/app/assets/images/file_bin.png
new file mode 100644
index 00000000000..b3feafcce0b
--- /dev/null
+++ b/app/assets/images/file_bin.png
diff --git a/app/assets/images/dir.png b/app/assets/images/file_dir.png
index bd941249c87..bd941249c87 100644
--- a/app/assets/images/dir.png
+++ b/app/assets/images/file_dir.png
diff --git a/app/assets/images/file_empty.png b/app/assets/images/file_empty.png
new file mode 100644
index 00000000000..2e85bb48737
--- /dev/null
+++ b/app/assets/images/file_empty.png
diff --git a/app/assets/images/file_img.png b/app/assets/images/file_img.png
new file mode 100644
index 00000000000..ca554c5aefe
--- /dev/null
+++ b/app/assets/images/file_img.png
diff --git a/app/assets/images/txt.png b/app/assets/images/file_txt.png
index f3638cb4e1e..f3638cb4e1e 100644
--- a/app/assets/images/txt.png
+++ b/app/assets/images/file_txt.png
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1faf8f263b7..a13458aabf0 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -272,7 +272,6 @@ nav.main_menu {
     display: inline-block;
     color: $style_color;
     position: relative;
-    box-shadow: 1px 0 0 rgba(255, 255, 255, 0.1);
     margin: 0;
     float:left;
     text-shadow:0 1px 1px white;
diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss
index 592992541af..d27a24f0a04 100644
--- a/app/assets/stylesheets/tree.scss
+++ b/app/assets/stylesheets/tree.scss
@@ -144,6 +144,7 @@
 
     th { 
       background:#f5f5f5;
+      border-color:#f1f1f1;
     }
   }
 
diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml
index e5908676ae8..63ff6196a1f 100644
--- a/app/views/refs/_tree.html.haml
+++ b/app/views/refs/_tree.html.haml
@@ -24,7 +24,7 @@
       - if tree.up_dir?
         %tr{ :class => "tree-item", :url => tree.up_dir_path }
           %td.tree-item-file-name
-            = image_tag "dir.png"
+            = image_tag "file_empty.png"
             = link_to "..", tree.up_dir_path, :remote => :true
           %td
           %td
diff --git a/app/views/refs/_tree_file.html.haml b/app/views/refs/_tree_file.html.haml
index 78662229afa..1077a346e6e 100644
--- a/app/views/refs/_tree_file.html.haml
+++ b/app/views/refs/_tree_file.html.haml
@@ -2,7 +2,7 @@
 .view_file
   .view_file_header
     .row
-      .span1.file_icon= image_tag "txt.png"
+      .span1.file_icon= image_tag( file.image? ? "file_img.png" : "file_txt.png")
       .span2.mode_text= file.mode
       .span7.file_name= name
       .span4.right
diff --git a/app/views/refs/_tree_item.html.haml b/app/views/refs/_tree_item.html.haml
index 420307c7635..691a2b97369 100644
--- a/app/views/refs/_tree_item.html.haml
+++ b/app/views/refs/_tree_item.html.haml
@@ -4,9 +4,14 @@
 %tr{ :class => "tree-item", :url => tree_file_project_ref_path(@project, @ref, file) }
   %td.tree-item-file-name
     - if content.is_a?(Grit::Blob)
-      = image_tag "txt.png"
+      - if content.text?
+        = image_tag "file_txt.png"
+      - elsif content.image?
+        = image_tag "file_img.png"
+      - else 
+        = image_tag "file_bin.png"
     - else
-      = image_tag "dir.png"
+      = image_tag "file_dir.png"
     = link_to truncate(content.name, :length => 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), :remote => :true
   %td.cgray
     = time_ago_in_words(content_commit.committed_date)