Commit 31a9d6531dcbfc72babf3da52d17cde61b4bcc04

Authored by Dmitriy Zaporozhets
1 parent 5eecbfdb

commits notes under diff. tab removed

app/assets/stylesheets/projects.css.scss
@@ -52,7 +52,8 @@ @@ -52,7 +52,8 @@
52 background: #eee; 52 background: #eee;
53 } 53 }
54 .diff_file_content { 54 .diff_file_content {
55 - overflow-x: scroll; 55 + overflow:auto;
  56 + overflow-y:hidden;
56 background:#fff; 57 background:#fff;
57 color:#333; 58 color:#333;
58 font-size: 12px; 59 font-size: 12px;
@@ -174,9 +175,9 @@ a { @@ -174,9 +175,9 @@ a {
174 .old_line, .new_line { 175 .old_line, .new_line {
175 background:#ECECEC; 176 background:#ECECEC;
176 color:#777; 177 color:#777;
177 - width:15px; 178 + width:30px;
178 float:left; 179 float:left;
179 - padding: 0px 10px; 180 + padding: 0px 5px;
180 border-right: 1px solid #ccc; 181 border-right: 1px solid #ccc;
181 } 182 }
182 } 183 }
app/views/commits/show.html.haml
1 %h3 1 %h3
2 - = "[ #{@commit.committer} ] #{truncate(@commit.safe_message)}" 2 + = "[ #{@commit.author_name} ] #{truncate(@commit.safe_message, :length => 70)}"
3 -#= link_to 'Back', project_commits_path(@project), :class => "button" 3 -#= link_to 'Back', project_commits_path(@project), :class => "button"
4 %table.round-borders 4 %table.round-borders
5 %tr 5 %tr
@@ -9,11 +9,8 @@ @@ -9,11 +9,8 @@
9 %td Author 9 %td Author
10 %td= @commit.author_name 10 %td= @commit.author_name
11 %tr 11 %tr
12 - %td Commiter  
13 - %td= @commit.committer  
14 - %tr  
15 %td Commited Date 12 %td Commited Date
16 - %td= @commit.committed_date 13 + %td= @commit.committed_date.stamp("21 Aug 2011, 11:15pm")
17 %tr 14 %tr
18 %td Message 15 %td Message
19 %td 16 %td
@@ -24,18 +21,7 @@ @@ -24,18 +21,7 @@
24 %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id) 21 %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id)
25 .clear 22 .clear
26 23
27 -#tabs  
28 - %ul  
29 - %li  
30 - %a{ :href => "#tabs-1" } Diff  
31 - %li  
32 - %a{ :href => "#tabs-2" } Comments  
33 - %span{ :class => "notes_count" }= @notes.count  
34 - %hr  
35 - #tabs-1  
36 - = render "commits/diff"  
37 - #tabs-2  
38 - = render "notes/notes" 24 +%br
39 25
40 -:javascript  
41 - $(function() { $( "#tabs" ).tabs(); }); 26 += render "commits/diff"
  27 += render "notes/notes"