Commit ee6c4a2c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve commits UI

parent 6a6a3345
v 7.9.0 (unreleased) v 7.9.0 (unreleased)
- Fix broken access control for note attachments (Hannes Rosenögger) - Move labels/milestones tabs to sidebar
v 7.8.0 (unreleased) v 7.8.0 (unreleased)
- Replace highlight.js with rouge-fork rugments (Stefan Tatschner) - Replace highlight.js with rouge-fork rugments (Stefan Tatschner)
......
...@@ -136,10 +136,13 @@ ...@@ -136,10 +136,13 @@
/** /**
* COMMIT ROW * COMMIT ROW
*/ */
li.commit { ul li.commit {
padding: 8px 0;
.commit-row-title { .commit-row-title {
font-size: $list-font-size; font-size: $list-font-size;
margin-bottom: 2px; line-height: 20px;
margin-bottom: 5px;
.notes_count { .notes_count {
float: right; float: right;
...@@ -199,7 +202,7 @@ li.commit { ...@@ -199,7 +202,7 @@ li.commit {
} }
.committed_ago { .committed_ago {
float: right; display: inline-block;
} }
} }
...@@ -245,3 +248,15 @@ li.commit { ...@@ -245,3 +248,15 @@ li.commit {
z-index: 2; z-index: 2;
} }
} }
.commits-row {
ul {
margin: 0;
}
.commits-row-date {
font-size: 15px;
line-height: 20px;
margin-bottom: 5px;
}
}
%li.commit.js-toggle-container %li.commit.js-toggle-container
.commit-row-title .commit-row-title
= link_to commit.short_id, project_commit_path(project, commit), class: "commit_short_id" %strong.str-truncated
 
%span.str-truncated
= link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message" = link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message"
- if commit.description? - if commit.description?
%a.text-expander.js-toggle-button ... %a.text-expander.js-toggle-button ...
...@@ -27,5 +25,8 @@ ...@@ -27,5 +25,8 @@
.commit-row-info .commit-row-info
= commit_author_link(commit, avatar: true, size: 16) = commit_author_link(commit, avatar: true, size: 16)
authored
.committed_ago .committed_ago
#{time_ago_with_tooltip(commit.committed_date)}   #{time_ago_with_tooltip(commit.committed_date)}  
.pull-right
= link_to commit.short_id, project_commit_path(project, commit), class: "commit_short_id"
...@@ -3,12 +3,13 @@ ...@@ -3,12 +3,13 @@
- @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits| - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
.row.commits-row .row.commits-row
.col-md-2 .col-md-2.hidden-xs.hidden-sm
%h4 %h5.commits-row-date
%i.fa.fa-calendar %i.fa.fa-calendar
%span= day.stamp("28 Aug, 2010") %span= day.stamp("28 Aug, 2010")
%p= pluralize(commits.count, 'commit') .light
.col-md-10 = pluralize(commits.count, 'commit')
.col-md-10.col-sm-12
%ul.bordered-list %ul.bordered-list
= render commits, project: project = render commits, project: project
%hr.lists-separator %hr.lists-separator
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