Download as
Browse Code »

Commit e44ee826ac1cb21d3af54381608c225e0644b79b

Authored by Dmitriy Zaporozhets
1 parent faaa8a29
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

tree browse -> file icons

Showing 14 changed files with 10 additions and 5 deletions   Show diff stats
app/assets/images/comment_add.png
View file @e44ee82

1.16 KB | W: | H:

778 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/assets/images/dir.png
View file @faaa8a2

485 Bytes
app/assets/images/download.png
View file @e44ee82

3.55 KB | W: | H:

599 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/assets/images/file_bin.png 0 → 100644
View file @e44ee82

219 Bytes
app/assets/images/file_dir.png 0 → 100644
View file @e44ee82

485 Bytes
app/assets/images/file_empty.png 0 → 100644
View file @e44ee82

319 Bytes
app/assets/images/file_img.png 0 → 100644
View file @e44ee82

536 Bytes
app/assets/images/file_txt.png 0 → 100644
View file @e44ee82

290 Bytes
app/assets/images/txt.png
View file @faaa8a2

290 Bytes
app/assets/stylesheets/common.scss
  Diff comments   View file @e44ee82
@@ -272,7 +272,6 @@ nav.main_menu { @@ -272,7 +272,6 @@ nav.main_menu {
272 display: inline-block; 272 display: inline-block;
273 color: $style_color; 273 color: $style_color;
274 position: relative; 274 position: relative;
275 - box-shadow: 1px 0 0 rgba(255, 255, 255, 0.1);  
276 margin: 0; 275 margin: 0;
277 float:left; 276 float:left;
278 text-shadow:0 1px 1px white; 277 text-shadow:0 1px 1px white;
app/assets/stylesheets/tree.scss
  Diff comments   View file @e44ee82
@@ -144,6 +144,7 @@ @@ -144,6 +144,7 @@
144 144
145 th { 145 th {
146 background:#f5f5f5; 146 background:#f5f5f5;
  147 + border-color:#f1f1f1;
147 } 148 }
148 } 149 }
149 150
app/views/refs/_tree.html.haml
  Diff comments   View file @e44ee82
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 - if tree.up_dir? 24 - if tree.up_dir?
25 %tr{ :class => "tree-item", :url => tree.up_dir_path } 25 %tr{ :class => "tree-item", :url => tree.up_dir_path }
26 %td.tree-item-file-name 26 %td.tree-item-file-name
27 - = image_tag "dir.png" 27 + = image_tag "file_empty.png"
28 = link_to "..", tree.up_dir_path, :remote => :true 28 = link_to "..", tree.up_dir_path, :remote => :true
29 %td 29 %td
30 %td 30 %td
app/views/refs/_tree_file.html.haml
  Diff comments   View file @e44ee82
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 .view_file 2 .view_file
3 .view_file_header 3 .view_file_header
4 .row 4 .row
5 - .span1.file_icon= image_tag "txt.png" 5 + .span1.file_icon= image_tag( file.image? ? "file_img.png" : "file_txt.png")
6 .span2.mode_text= file.mode 6 .span2.mode_text= file.mode
7 .span7.file_name= name 7 .span7.file_name= name
8 .span4.right 8 .span4.right
app/views/refs/_tree_item.html.haml
  Diff comments   View file @e44ee82
@@ -4,9 +4,14 @@ @@ -4,9 +4,14 @@
4 %tr{ :class => "tree-item", :url => tree_file_project_ref_path(@project, @ref, file) } 4 %tr{ :class => "tree-item", :url => tree_file_project_ref_path(@project, @ref, file) }
5 %td.tree-item-file-name 5 %td.tree-item-file-name
6 - if content.is_a?(Grit::Blob) 6 - if content.is_a?(Grit::Blob)
7 - = image_tag "txt.png" 7 + - if content.text?
  8 + = image_tag "file_txt.png"
  9 + - elsif content.image?
  10 + = image_tag "file_img.png"
  11 + - else
  12 + = image_tag "file_bin.png"
8 - else 13 - else
9 - = image_tag "dir.png" 14 + = image_tag "file_dir.png"
10 = link_to truncate(content.name, :length => 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), :remote => :true 15 = link_to truncate(content.name, :length => 40), tree_file_project_ref_path(@project, @ref || @commit.id, file), :remote => :true
11 %td.cgray 16 %td.cgray
12 = time_ago_in_words(content_commit.committed_date) 17 = time_ago_in_words(content_commit.committed_date)