diff options
| -rw-r--r-- | app/assets/stylesheets/commits.css.scss | 43 | ||||
| -rw-r--r-- | app/assets/stylesheets/projects.css.scss | 12 | ||||
| -rw-r--r-- | app/controllers/commits_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/commits/_commits.html.haml | 22 |
4 files changed, 17 insertions, 62 deletions
diff --git a/app/assets/stylesheets/commits.css.scss b/app/assets/stylesheets/commits.css.scss index 2b2a4a679c9..1addb257116 100644 --- a/app/assets/stylesheets/commits.css.scss +++ b/app/assets/stylesheets/commits.css.scss @@ -113,46 +113,3 @@ ul.bordered-list li:last-child { border:none } tr.line_notes_row { border-bottom:1px solid #DDD; } - -/** - * - * COMMIT LIST - * - */ - -.commit-info{float: right;} -.commit-info data{ - padding: 4px 10px; - font-size: 11px; -} -a.commit{padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;} -a.commit:last-child {border-bottom: 0} -a.commit img{float: left; margin-right: 10px;} -a.commit .commit-title{display: block;} -a.commit .commit-title{margin-bottom: 10px} -a.commit .commit-author{color: #999; font-weight: normal; font-style: italic;} -a.commit .commit-author strong{font-weight: bold; font-style: normal;} - -.commit-button{ - background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.192, #fff), to(#f4f4f4)); - background-image: -webkit-linear-gradient(#fff 19.2%, #f4f4f4); - background-image: -moz-linear-gradient(#fff 19.2%, #f4f4f4); - background-image: -o-linear-gradient(#fff 19.2%, #f4f4f4); - box-shadow: 0 -1px 0 white inset; - display: block; - border: 1px solid #eee; - border-radius: 5px; - margin-bottom: 2px; - position: relative; - padding-right: 20px !important; -} - -.commit-button i{ - background: url('images.png') no-repeat -138px -27px; - width: 6px; - height: 9px; - float: right; - position: absolute; - top: 6px; - right: 5px; -} diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index e63f6dfd5e7..df6b09742b4 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -52,18 +52,19 @@ float:left; margin-right:10px; } -.news-feed .project-updates a.project-update span.update-title,.dashboard-page .news-feed .project-updates li a span.update-author { +span.update-title, +span.update-author { display:block; } -.news-feed .project-updates a.project-update span.update-title { +span.update-title { margin-bottom:10px } -.news-feed .project-updates a.project-update span.update-author { +span.update-author { color:#999; font-weight:normal; font-style:italic; } -.news-feed .project-updates a.project-update span.update-author strong { +span.update-author strong { font-weight:bold; font-style: normal; } @@ -87,7 +88,8 @@ a.update-item img { float:left; margin-right:10px; } -a.update-item span.update-title,.dashboard-page .news-feed .project-updates li a span.update-author { +span.update-title, +span.update-author { display:block; } a.update-item span.update-title { diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb index a938461fed1..e2853dd6cf6 100644 --- a/app/controllers/commits_controller.rb +++ b/app/controllers/commits_controller.rb @@ -29,6 +29,8 @@ class CommitsController < ApplicationController @line_notes = project.commit_line_notes(@commit) + render_full_content + respond_to do |format| format.html format.js { respond_with_notes } diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml index 17f2dc623c1..6d7828a637a 100644 --- a/app/views/commits/_commits.html.haml +++ b/app/views/commits/_commits.html.haml @@ -5,21 +5,15 @@ %ul.unstyled - commits.each do |commit| %li - %a{ :class => "commit", :href => project_commit_path(@project, :id => commit.id) } - %span.commit-info - %data.commit-button - = truncate(commit.id.to_s, :length => 16) - %i - %data.commit-browse{ :onclick => "location.href='#{tree_project_ref_path(@project, commit.id)}';return false;"} - Browse Code - - if commit.author_email - = image_tag gravatar_icon(commit.author_email), :class => "left", :width => 40, :style => "padding-right:5px;" - - else - = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;" - %span.commit-title + %a{ :class => "update-item", :href => project_commit_path(@project, :id => commit.id) } + .right.btn + = truncate(commit.id.to_s, :length => 10) + ยป + = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 32 + %div %strong - = truncate(commit.safe_message, :length => 70) - %span.commit-author + = truncate(commit.safe_message, :length => 50) + %span.update-author %strong= commit.author_name = time_ago_in_words(commit.committed_date) ago |