diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 4c20273e323263cef4e8b6e03646248ace54b1f2..906715a183ef927eea7acdee54662329f556e759 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -28,17 +28,7 @@ /** File stat **/ .file_stats { - margin-bottom:10px; - @include round-borders-all(4px); - span { - border-top: 1px solid #eaeaea; - padding:5px 5px; - display:block; - &:first-child { - border-top:none; - } - img { width:18px; float:left; diff --git a/app/views/commits/_diff.html.haml b/app/views/commits/_diff.html.haml index 4bf0e06a4ef814e32598eb8397f9a2b8ea854c47..fd929f30b39e65d4202b31b27940371d0fbe7429 100644 --- a/app/views/commits/_diff.html.haml +++ b/app/views/commits/_diff.html.haml @@ -1,4 +1,5 @@ -.file_stats= render "commits/diff_head" +.file_stats + = render "commits/diff_head" - @commit.diffs.each do |diff| - next if diff.diff.empty? diff --git a/app/views/commits/_diff_head.html.haml b/app/views/commits/_diff_head.html.haml index 922c35990af6c0ed1e978ac5747e99515cfafd2e..26105261dc9e1a39e85e562488dd2b1d792af9ad 100644 --- a/app/views/commits/_diff_head.html.haml +++ b/app/views/commits/_diff_head.html.haml @@ -1,24 +1,29 @@ -- @commit.diffs.each do |diff| - - if diff.deleted_file - %span.removed_file - %a{:href => "##{diff.a_path}"} - = diff.a_path - = image_tag "blueprint_delete.png" - - elsif diff.renamed_file - %span.moved_file - %a{:href => "##{diff.b_path}"} - = diff.a_path - = "->" - = diff.b_path - = image_tag "blueprint_notice.png" - - elsif diff.new_file - %span.new_file - %a{:href => "##{diff.b_path}"} - = diff.b_path - = image_tag "blueprint_add.png" - - else - %span.edit_file - %a{:href => "##{diff.b_path}"} - = diff.b_path - = image_tag "blueprint_info.png" +%table + %thead + %th Files + - @commit.diffs.each do |diff| + %tr + %td + - if diff.deleted_file + %span.removed_file + %a{:href => "##{diff.a_path}"} + = diff.a_path + = image_tag "blueprint_delete.png" + - elsif diff.renamed_file + %span.moved_file + %a{:href => "##{diff.b_path}"} + = diff.a_path + = "->" + = diff.b_path + = image_tag "blueprint_notice.png" + - elsif diff.new_file + %span.new_file + %a{:href => "##{diff.b_path}"} + = diff.b_path + = image_tag "blueprint_add.png" + - else + %span.edit_file + %a{:href => "##{diff.b_path}"} + = diff.b_path + = image_tag "blueprint_info.png" diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml index 93a828383ba6d6b940b78676b886d6637d95147b..6fb4b5e3f4f2d3280ea6dbfc2175fd2c2b2f4f0a 100644 --- a/app/views/commits/show.html.haml +++ b/app/views/commits/show.html.haml @@ -1,7 +1,18 @@ -%h3 - = "[ #{@commit.author_name} ] #{truncate(@commit.safe_message, :length => 70)}" +- content_for(:body_class, "project-page commits-page") + +-#%a.right.button{:href => "#"} Download +-#-if can? current_user, :admin_project, @project + %a.right.button.blue{:href => "#"} EDIT +%h2.icon + %span + %d + = "#{truncate(@commit.safe_message, :length => 50)}" +.right + = link_to 'Browse Code', tree_project_ref_path(@project, @commit.id), :class => "button" -#= link_to 'Back', project_commits_path(@project), :class => "button" %table.round-borders + %thead + %th{:colspan => 2} Details %tr %td ID %td= @commit.id @@ -16,9 +27,6 @@ %td %pre.commit_message = preserve @commit.safe_message - %tr - %td Tree - %td= link_to 'Browse Code', tree_project_ref_path(@project, @commit.id) .clear %br