Builds page redesign

15 files changed, 75 insertions, 36 deletions

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index edb5ee71f98..1f2f9f7754c 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -251,3 +251,9 @@
 .btn-file-option {
   background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
 }
+
+.btn-refresh {
+  i {
+    color: $gl-icon-color;
+  }
+}
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 201f3e5ca46..3340cee9643 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -83,3 +83,16 @@
     }
   }
 }
+
+table.builds {
+
+  .build-link {
+    a {
+      color: $gl-dark-link-color;
+    }
+  }
+
+  .btn-refresh {
+    margin-left: 10px;
+  }
+}
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 5c945e2d4c9..c2cd227571f 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -35,13 +35,19 @@
     font-weight: bold;
   }
 
-  .ci-status {
-    margin-right: 10px;
+  .time_ago {
+    margin-left: 8px;
   }
 
   .fa-clipboard {
     color: $dropdown-title-btn-color;
   }
+
+  .commit-info {
+    &.branches {
+      margin-left: 8px;
+    }
+  }
 }
 
 .commit-box {
@@ -91,6 +97,14 @@
   }
 }
 
+.commit-action-buttons {
+  i {
+    color: $gl-icon-color;
+    font-size: 13px;
+    margin-right: 3px;
+  }
+}
+
 /*
  * Commit message textarea for web editor and
  * custom merge request message
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index dbb6daf0d70..2370d35924e 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -1,7 +1,7 @@
 .container-fluid {
   .ci-status {
     padding: 2px 7px;
-    margin-right: 5px;
+    margin-right: 10px;
     border: 1px solid #eee;
     white-space: nowrap;
     @include border-radius(4px);
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3e0074da394..313a8fd56c5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -316,8 +316,7 @@ module ApplicationHelper
     html = content_tag :span, entity_title
 
     if count.present?
-      html += " "
-      html += content_tag :span, number_with_delimiter(count), class: 'badge'
+      html += content_tag :span, " (#{number_with_delimiter(count)})"
     end
 
     html.html_safe
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index 84b78a6f36a..2b99f360d6f 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -68,5 +68,5 @@
           = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel' do
             %i.fa.fa-remove.cred
         - elsif defined?(allow_retry) && allow_retry && build.retryable?
-          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
+          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-refresh' do
             %i.fa.fa-refresh
diff --git a/app/views/dashboard/snippets/index.html.haml b/app/views/dashboard/snippets/index.html.haml
index d4e7862981c..53f1094ec07 100644
--- a/app/views/dashboard/snippets/index.html.haml
+++ b/app/views/dashboard/snippets/index.html.haml
@@ -13,26 +13,26 @@
     %li{ class: ("active" unless params[:scope]) }
       = link_to dashboard_snippets_path do
         All
-        %span.badge
-          = current_user.snippets.count
+        %span
+          (#{current_user.snippets.count})
 
     %li{ class: ("active" if params[:scope] == "are_private") }
       = link_to dashboard_snippets_path(scope: 'are_private') do
         Private
-        %span.badge
-          = current_user.snippets.are_private.count
+        %span
+          (#{current_user.snippets.are_private.count})
 
     %li{ class: ("active" if params[:scope] == "are_internal") }
       = link_to dashboard_snippets_path(scope: 'are_internal') do
         Internal
-        %span.badge
-          = current_user.snippets.are_internal.count
+        %span
+          (#{current_user.snippets.are_internal.count})
 
     %li{ class: ("active" if params[:scope] == "are_public") }
       = link_to dashboard_snippets_path(scope: 'are_public') do
         Public
-        %span.badge
-          = current_user.snippets.are_public.count
+        %span
+          (#{current_user.snippets.are_public.count})
 
 = render 'snippets/snippets'
 
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index e27fefc0afd..a87b796c6f3 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -8,15 +8,15 @@
       = link_to todos_filter_path(state: 'pending') do
         %span
           To do
-        %span{class: 'badge'}
-          = todos_pending_count
+        %span
+          (#{todos_pending_count})
     - todo_done_active = ('active' if params[:state] == 'done')
     %li{class: "todos-done #{todo_done_active}"}
       = link_to todos_filter_path(state: 'done') do
         %span
           Done
-        %span{class: 'badge'}
-          = todos_done_count
+        %span
+          (#{todos_done_count})
 
   .nav-controls
     - if @todos.any?(&:pending?)
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index d842dd54e6b..fcb1e656d72 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -6,20 +6,21 @@
     %li{class: ('active' if @scope.nil?)}
       = link_to project_builds_path(@project) do
         All
-        %span.badge.js-totalbuilds-count
-          = number_with_delimiter(@all_builds.count(:id))
+        %span.js-totalbuilds-count
+          (#{number_with_delimiter(@all_builds.count(:id))})
+
 
     %li{class: ('active' if @scope == 'running')}
       = link_to project_builds_path(@project, scope: :running) do
         Running
-        %span.badge.js-running-count
-          = number_with_delimiter(@all_builds.running_or_pending.count(:id))
+        %span.js-running-count
+          (#{number_with_delimiter(@all_builds.running_or_pending.count(:id))})
 
     %li{class: ('active' if @scope == 'finished')}
       = link_to project_builds_path(@project, scope: :finished) do
         Finished
-        %span.badge.js-running-count
-          = number_with_delimiter(@all_builds.finished.count(:id))
+        %span.js-running-count
+          (#{number_with_delimiter(@all_builds.finished.count(:id))})
 
   .nav-controls
     - if can?(current_user, :update_build, @project)
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index e5a5efb3153..1b382e48365 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -76,5 +76,5 @@
           = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel' do
             %i.fa.fa-remove.cred
         - elsif defined?(allow_retry) && allow_retry && build.retryable?
-          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry' do
+          = link_to retry_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Retry', class: 'btn btn-refresh' do
             %i.fa.fa-refresh
diff --git a/app/views/projects/commit/_ci_menu.html.haml b/app/views/projects/commit/_ci_menu.html.haml
index ea33aa472a6..b2d3db0bdc6 100644
--- a/app/views/projects/commit/_ci_menu.html.haml
+++ b/app/views/projects/commit/_ci_menu.html.haml
@@ -2,8 +2,8 @@
   = nav_link(path: 'commit#show') do
     = link_to namespace_project_commit_path(@project.namespace, @project, @commit.id) do
       Changes
-      %span.badge= @diffs.count
+      %span (#{@diffs.count})
   = nav_link(path: 'commit#builds') do
     = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id) do
       Builds
-      %span.badge= @statuses.count
+      %span (#{@statuses.count})
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index b73cbf3f1d8..01163e526b2 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -1,4 +1,4 @@
-.pull-right
+.pull-right.commit-action-buttons
   %div
     - if @notes_count > 0
       %span.btn.disabled.btn-grouped
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 82aac1fbd15..2b0c9a4b4de 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -3,7 +3,6 @@
     - branch = commit_default_branch(@project, @branches)
     = link_to(namespace_project_tree_path(@project.namespace, @project, branch)) do
       %span.label.label-gray
-        %i.fa.fa-code-fork
         = branch
     - if @branches.any? || @tags.any?
       = link_to("#", class: "js-details-expand") do
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index 7a5b0d993db..2c8fecae760 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -2,7 +2,8 @@
   = nav_link(controller: [:commit, :commits]) do
     = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
       Commits
-      %span.badge= number_with_delimiter(@repository.commit_count)
+      %span
+        (#{number_with_delimiter(@repository.commit_count)})
 
   = nav_link(controller: %w(network)) do
     = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
@@ -15,9 +16,11 @@
   = nav_link(html_options: {class: branches_tab_class}) do
     = link_to namespace_project_branches_path(@project.namespace, @project) do
       Branches
-      %span.badge.js-totalbranch-count= @repository.branch_count
+      %span.js-totalbranch-count
+        (#{@repository.branch_count})
 
   = nav_link(controller: [:tags, :releases]) do
     = link_to namespace_project_tags_path(@project.namespace, @project) do
       Tags
-      %span.badge.js-totaltags-count= @repository.tag_count
+      %span.js-totaltags-count
+        (#{@repository.tag_count})
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 290753d57c6..0c97a29847d 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -50,20 +50,24 @@
         %li.notes-tab
           = link_to namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#notes', action: 'notes', toggle: 'tab'} do
             Discussion
-            %span.badge= @merge_request.mr_and_commit_notes.user.nonawards.count
+            %span
+              (#{@merge_request.mr_and_commit_notes.user.nonawards.count})
         %li.commits-tab
           = link_to commits_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#commits', action: 'commits', toggle: 'tab'} do
             Commits
-            %span.badge= @commits.size
+            %span
+              (#{@commits.size})
         - if @ci_commit
           %li.builds-tab
             = link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: '#builds', action: 'builds', toggle: 'tab'} do
               Builds
-              %span.badge= @statuses.size
+              %span
+                (#{@statuses.size})
         %li.diffs-tab
           = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do
             Changes
-            %span.badge= @merge_request.diff_size
+            %span
+              (#{@merge_request.diff_size})
 
       .tab-content
         #notes.notes.tab-pane.voting_notes