1 files changed, 24 insertions, 19 deletions

diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 367027182b6..929496f81d8 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -9,26 +9,31 @@
 
 = cache(cache_key) do
   %li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" }
-    .commit-row-title
-      %span.item-title
-        = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message"
-        - if commit.description?
-          %a.text-expander.js-toggle-button ...
+    = commit_author_avatar(commit, size: 36)
+    .commit-info-block
+      .commit-row-title
+        %span.item-title
+          = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message"
+          %span.commit-row-message.visible-xs-inline
+            ·
+            = commit.short_id
+          - if commit.status
+            = render_commit_status(commit, cssclass: 'visible-xs-inline')
+          - if commit.description?
+            %a.text-expander.hidden-xs.js-toggle-button ...
 
-      .pull-right
-        - if commit.status
-          = render_commit_status(commit)
-        = clipboard_button(clipboard_text: commit.id)
-        = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id"
+        .commit-actions.hidden-xs
+          - if commit.status
+            = render_commit_status(commit, cssclass: 'btn btn-transparent')
+          = clipboard_button_with_class({ clipboard_text: commit.id }, css_class: 'btn-transparent')
+          = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent"
+          = link_to_browse_code(project, commit)
 
-    - if commit.description?
-      .commit-row-description.js-toggle-content
-        %pre
+      - if commit.description?
+        %pre.commit-row-description.js-toggle-content
           = preserve(markdown(escape_once(commit.description), pipeline: :single_line, author: commit.author))
 
-    .commit-row-info
-      by
-      = commit_author_link(commit, avatar: true, size: 24)
-      .committed_ago
-        #{time_ago_with_tooltip(commit.committed_date)}  
-      = link_to_browse_code(project, commit)
+      .commit-row-info
+        = commit_author_link(commit, avatar: false, size: 24)
+        authored
+        #{time_ago_with_tooltip(commit.committed_date)}