Commit ad25dac8b6e7884a333591a6337bd38f3eea0740
1 parent
d9ba277e
Exists in
master
and in
4 other branches
Change the design a bit to look more like before.
Showing
2 changed files
with
30 additions
and
11 deletions
Show diff stats
app/assets/stylesheets/sections/commits.scss
| 1 | 1 | .commit-head { |
| 2 | - @extend .well; | |
| 3 | - @extend .clearfix; | |
| 2 | + @extend .main_box; | |
| 4 | 3 | |
| 5 | 4 | padding: 14px; |
| 6 | 5 | padding-bottom: 8px; |
| ... | ... | @@ -17,9 +16,29 @@ |
| 17 | 16 | } |
| 18 | 17 | |
| 19 | 18 | .commit-description { |
| 19 | + font-size: 14px; | |
| 20 | + padding: 0px; | |
| 21 | + padding-bottom: 4px; | |
| 22 | + border: none; | |
| 20 | 23 | background-color: white; |
| 21 | 24 | } |
| 22 | 25 | |
| 26 | + .commit-info { | |
| 27 | + @extend .middle_box_content; | |
| 28 | + @extend .clearfix; | |
| 29 | + | |
| 30 | + padding-bottom: 8px; | |
| 31 | + padding-top: 8px; | |
| 32 | + | |
| 33 | + margin-left: -14px; | |
| 34 | + margin-right: -14px; | |
| 35 | + margin-bottom: -8px; | |
| 36 | + | |
| 37 | + .author .name, .committer .name { | |
| 38 | + font-weight: bold; | |
| 39 | + } | |
| 40 | + } | |
| 41 | + | |
| 23 | 42 | .sha-block { |
| 24 | 43 | float: right; |
| 25 | 44 | margin-left: 10px | ... | ... |
app/views/commits/show.html.haml
| ... | ... | @@ -5,23 +5,23 @@ |
| 5 | 5 | - if @commit.description.present? |
| 6 | 6 | %pre.commit-description |
| 7 | 7 | = commit_msg_with_link_to_issues(@project, @commit.description) |
| 8 | - %span.sha-block | |
| 9 | - commit | |
| 10 | - %code= @commit.id | |
| 11 | - %span.sha-block | |
| 12 | - = pluralize(@commit.parents.count, "parent") | |
| 13 | - - @commit.parents.each do |parent| | |
| 14 | - %code= link_to parent.id, project_commit_path(@project, parent) | |
| 15 | 8 | .commit-info |
| 9 | + %span.sha-block | |
| 10 | + commit | |
| 11 | + %code= @commit.id | |
| 12 | + %span.sha-block | |
| 13 | + = pluralize(@commit.parents.count, "parent") | |
| 14 | + - @commit.parents.each do |parent| | |
| 15 | + %code= link_to parent.id, project_commit_path(@project, parent) | |
| 16 | 16 | .author |
| 17 | 17 | = image_tag gravatar_icon(@commit.author_email, 24), :class => "avatar", :height => 24, :width => 24 |
| 18 | - = @commit.author_name | |
| 18 | + %span.name= @commit.author_name | |
| 19 | 19 | authored |
| 20 | 20 | %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")} |
| 21 | 21 | #{time_ago_in_words(@commit.authored_date)} ago |
| 22 | 22 | - if @commit.different_committer? |
| 23 | 23 | .committer |
| 24 | - = @commit.committer_name | |
| 24 | + %span.name= @commit.committer_name | |
| 25 | 25 | committed |
| 26 | 26 | %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")} |
| 27 | 27 | #{time_ago_in_words(@commit.committed_date)} ago | ... | ... |