diff options
| author | Arthur Schreiber <schreiber.arthur@gmail.com> | 2012-04-14 11:58:43 +0200 |
|---|---|---|
| committer | Arthur Schreiber <schreiber.arthur@gmail.com> | 2012-04-14 12:38:12 +0200 |
| commit | ad25dac8b6e7884a333591a6337bd38f3eea0740 (patch) | |
| tree | 3e4f02db210e2399deff626bd3d21d7d58c85d4a /app | |
| parent | d9ba277ee1f175ef67e1e9358804d0727bf455ce (diff) | |
| download | gitlab-ce-ad25dac8b6e7884a333591a6337bd38f3eea0740.tar.gz | |
Change the design a bit to look more like before.
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/sections/commits.scss | 23 | ||||
| -rw-r--r-- | app/views/commits/show.html.haml | 18 |
2 files changed, 30 insertions, 11 deletions
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 60f43297c1b..85e7315ec89 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -1,6 +1,5 @@ .commit-head { - @extend .well; - @extend .clearfix; + @extend .main_box; padding: 14px; padding-bottom: 8px; @@ -17,9 +16,29 @@ } .commit-description { + font-size: 14px; + padding: 0px; + padding-bottom: 4px; + border: none; background-color: white; } + .commit-info { + @extend .middle_box_content; + @extend .clearfix; + + padding-bottom: 8px; + padding-top: 8px; + + margin-left: -14px; + margin-right: -14px; + margin-bottom: -8px; + + .author .name, .committer .name { + font-weight: bold; + } + } + .sha-block { float: right; margin-left: 10px diff --git a/app/views/commits/show.html.haml b/app/views/commits/show.html.haml index fcf3d6661df..eae8c804c81 100644 --- a/app/views/commits/show.html.haml +++ b/app/views/commits/show.html.haml @@ -5,23 +5,23 @@ - if @commit.description.present? %pre.commit-description = commit_msg_with_link_to_issues(@project, @commit.description) - %span.sha-block - commit - %code= @commit.id - %span.sha-block - = pluralize(@commit.parents.count, "parent") - - @commit.parents.each do |parent| - %code= link_to parent.id, project_commit_path(@project, parent) .commit-info + %span.sha-block + commit + %code= @commit.id + %span.sha-block + = pluralize(@commit.parents.count, "parent") + - @commit.parents.each do |parent| + %code= link_to parent.id, project_commit_path(@project, parent) .author = image_tag gravatar_icon(@commit.author_email, 24), :class => "avatar", :height => 24, :width => 24 - = @commit.author_name + %span.name= @commit.author_name authored %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")} #{time_ago_in_words(@commit.authored_date)} ago - if @commit.different_committer? .committer - = @commit.committer_name + %span.name= @commit.committer_name committed %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")} #{time_ago_in_words(@commit.committed_date)} ago |