Commit 7300440a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve Commit#show page UI

parent 57b62c2b
...@@ -440,17 +440,24 @@ ...@@ -440,17 +440,24 @@
margin-top: 10px; margin-top: 10px;
} }
.ui-box.commit-box { .commit-box {
margin-top: 0; margin: 10px 0;
border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd;
padding: 20px 0;
.commit-committer-link, .commit-title {
.commit-author-link { margin: 0;
color: #333; font-size: 20px;
font-weight: bold; font-weight: bold;
text-shadow: 0 1px 1px #FFF; }
.commit-description {
margin-top: 15px;
} }
} }
.commit-stat-summary { .commit-stat-summary {
color: #666; color: #666;
line-height: 2; line-height: 2;
...@@ -477,3 +484,15 @@ li.commit { ...@@ -477,3 +484,15 @@ li.commit {
.commit-breadcrumb { .commit-breadcrumb {
padding: 0; padding: 0;
} }
.commit-info-row {
margin-bottom: 10px;
.avatar {
@extend .avatar-inline;
}
.commit-committer-link,
.commit-author-link {
color: #444;
font-weight: bold;
}
}
.ui-box.ui-box-show.commit-box .pull-right
.ui-box-head %div
.pull-right
- if @notes_count > 0 - if @notes_count > 0
%span.btn.disabled.grouped %span.btn.disabled.grouped
%i.icon-comment %i.icon-comment
= @notes_count = @notes_count
.left.btn-group .pull-left.btn-group
%a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} } %a.btn.grouped.dropdown-toggle{ data: {toggle: :dropdown} }
%i.icon-download-alt %i.icon-download-alt
Download as Download as
...@@ -15,36 +14,34 @@ ...@@ -15,36 +14,34 @@
%li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff) %li= link_to "Plain Diff", project_commit_path(@project, @commit, format: :diff)
= link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do = link_to project_tree_path(@project, @commit), class: "btn btn-primary grouped" do
%span Browse Code » %span Browse Code »
%h3.commit-title.page-title %div
= gfm escape_once(@commit.title)
- if @commit.description.present? %p
%pre.commit-description %span.light Commit
= gfm escape_once(@commit.description) = link_to @commit.id, project_commit_path(@project, @commit)
.ui-box-body .commit-info-row
.row %span.light Authored by
.span5 %strong
.author = commit_author_link(@commit, avatar: true, size: 24)
= commit_author_link(@commit, avatar: true, size: 32)
authored
%time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")} %time{title: @commit.authored_date.stamp("Aug 21, 2011 9:23pm")}
#{time_ago_in_words(@commit.authored_date)} ago #{time_ago_in_words(@commit.authored_date)} ago
- if @commit.different_committer?
.committer - if @commit.different_committer?
→ .commit-info-row
= commit_committer_link(@commit) %span.light Committed by
committed %strong
= commit_committer_link(@commit, avatar: true, size: 24)
%time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")} %time{title: @commit.committed_date.stamp("Aug 21, 2011 9:23pm")}
#{time_ago_in_words(@commit.committed_date)} ago #{time_ago_in_words(@commit.committed_date)} ago
.span6.pull-right
.pull-right .commit-info-row
.sha-block
%span.cgray commit
%span.label_commit= @commit.id
.clearfix
.pull-right
.sha-block
%span.cgray= pluralize(@commit.parents.count, "parent") %span.cgray= pluralize(@commit.parents.count, "parent")
- @commit.parents.each do |parent| - @commit.parents.each do |parent|
= link_to parent.id[0...10], project_commit_path(@project, parent) = link_to parent.id[0...10], project_commit_path(@project, parent)
.commit-box
%h3.commit-title
= gfm escape_once(@commit.title)
- if @commit.description.present?
%pre.commit-description
= gfm escape_once(@commit.description)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment