Improve commits UI

4 files changed, 28 insertions, 11 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 35387538d39..575afcbbb6a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
 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)
   - Replace highlight.js with rouge-fork rugments (Stefan Tatschner)
diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss
index 2e274d06c12..f6723eb308f 100644
--- a/app/assets/stylesheets/sections/commits.scss
+++ b/app/assets/stylesheets/sections/commits.scss
@@ -136,10 +136,13 @@
 /**
  * COMMIT ROW
  */
-li.commit {
+ul li.commit {
+  padding: 8px 0;
+
   .commit-row-title {
     font-size: $list-font-size;
-    margin-bottom: 2px;
+    line-height: 20px;
+    margin-bottom: 5px;
 
     .notes_count {
       float: right;
@@ -199,7 +202,7 @@ li.commit {
     }
 
     .committed_ago {
-      float: right;
+      display: inline-block;
     }
   }
 
@@ -245,3 +248,15 @@ li.commit {
     z-index: 2;
   }
 }
+
+.commits-row {
+  ul {
+    margin: 0;
+  }
+
+  .commits-row-date {
+    font-size: 15px;
+    line-height: 20px;
+    margin-bottom: 5px;
+  }
+}
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 1eb17f760dc..1bf1ada1680 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -1,8 +1,6 @@
 %li.commit.js-toggle-container
   .commit-row-title
-    = link_to commit.short_id, project_commit_path(project, commit), class: "commit_short_id"
-     
-    %span.str-truncated
+    %strong.str-truncated
       = link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message"
       - if commit.description?
         %a.text-expander.js-toggle-button ...
@@ -27,5 +25,8 @@
 
   .commit-row-info
     = commit_author_link(commit, avatar: true, size: 16)
+    authored
     .committed_ago
       #{time_ago_with_tooltip(commit.committed_date)}  
+    .pull-right
+      = link_to commit.short_id, project_commit_path(project, commit), class: "commit_short_id"
diff --git a/app/views/projects/commits/_commits.html.haml b/app/views/projects/commits/_commits.html.haml
index 2d0ca671fa0..0cd9ce1f371 100644
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
@@ -3,12 +3,13 @@
 
 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
   .row.commits-row
-    .col-md-2
-      %h4
+    .col-md-2.hidden-xs.hidden-sm
+      %h5.commits-row-date
         %i.fa.fa-calendar
         %span= day.stamp("28 Aug, 2010")
-      %p= pluralize(commits.count, 'commit')
-    .col-md-10
+      .light
+        = pluralize(commits.count, 'commit')
+    .col-md-10.col-sm-12
       %ul.bordered-list
         = render commits, project: project
   %hr.lists-separator