Style commits, branches and tags pages to match new UI

3 files changed, 17 insertions, 11 deletions

diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index a693c4b282f..cc0ec9483d2 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -1,20 +1,20 @@
 - commit = @repository.commit(branch.target)
 %li(class="js-branch-#{branch.name}")
-  %h4
+  %div
     = link_to namespace_project_tree_path(@project.namespace, @project, branch.name) do
       %strong.str-truncated= branch.name
+       
       - if branch.name == @repository.root_ref
-        %span.label.label-info default
+        %span.label.label-primary default
       - elsif @repository.merged_to_root_ref? branch.name
-        %span.label.label-primary.has_tooltip(title="Merged into #{@repository.root_ref}")
-          %i.fa.fa-check
+        %span.label.label-info.has_tooltip(title="Merged into #{@repository.root_ref}")
           merged
 
       - if @project.protected_branch? branch.name
         %span.label.label-success
           %i.fa.fa-lock
           protected
-    .pull-right
+    .controls.hidden-xs
       - if create_mr_button?(@repository.root_ref, branch.name)
         = link_to create_mr_path(@repository.root_ref, branch.name), class: 'btn btn-grouped btn-xs' do
           = icon('plus')
@@ -30,8 +30,7 @@
           = icon("trash-o")
 
   - if commit
-    %ul.list-unstyled
-      = render 'projects/commits/inline_commit', commit: commit, project: @project
+    = render 'projects/branches/commit', commit: commit, project: @project
   - else
     %p
       Cant find HEAD commit for this branch
diff --git a/app/views/projects/branches/_commit.html.haml b/app/views/projects/branches/_commit.html.haml
new file mode 100644
index 00000000000..68326e65d85
--- /dev/null
+++ b/app/views/projects/branches/_commit.html.haml
@@ -0,0 +1,7 @@
+.branch-commit.light
+  = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id"
+  ·
+  %span.str-truncated
+    = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message"
+  ·
+  #{time_ago_with_tooltip(commit.committed_date)}
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 80acc937908..6e2dc2d2710 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -1,7 +1,6 @@
 - page_title "Branches"
 = render "projects/commits/head"
-%h3.page-title
-  Branches
+.gray-content-block
   .pull-right
     - if can? current_user, :push_code, @project
       = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
@@ -24,9 +23,10 @@
             = sort_title_recently_updated
           = link_to namespace_project_branches_path(sort: 'last_updated') do
             = sort_title_oldest_updated
-%hr
+  .oneline
+    Protected branches can be managed in project settings
 - unless @branches.empty?
-  %ul.bordered-list.top-list.all-branches
+  %ul.content-list.all-branches
     - @branches.each do |branch|
       = render "projects/branches/branch", branch: branch
   = paginate @branches, theme: 'gitlab'