From 7878eb9fa69123981281c2d71a2964dca1b459ee Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Mon, 25 Apr 2016 15:02:15 -0500
Subject: [PATCH 1/4] Start builds redesign

---
 app/assets/stylesheets/framework/blocks.scss  |  9 +++++--
 app/assets/stylesheets/framework/buttons.scss |  2 +-
 .../stylesheets/framework/tw_bootstrap.scss   |  2 +-
 .../stylesheets/framework/typography.scss     |  4 ++--
 .../stylesheets/framework/variables.scss      |  3 ++-
 app/assets/stylesheets/pages/commit.scss      | 12 ++++++++--
 app/assets/stylesheets/pages/detail_page.scss |  2 +-
 .../stylesheets/pages/merge_requests.scss     | 20 ++++++++++++++--
 app/assets/stylesheets/pages/projects.scss    |  2 +-
 app/views/admin/builds/_build.html.haml       | 20 ++++++++--------
 app/views/admin/builds/index.html.haml        |  3 ++-
 app/views/admin/logs/show.html.haml           |  2 +-
 app/views/admin/users/index.html.haml         |  2 +-
 app/views/dashboard/todos/index.html.haml     |  2 +-
 app/views/events/_event_last_push.html.haml   |  2 +-
 app/views/explore/groups/index.html.haml      |  2 +-
 app/views/explore/snippets/index.html.haml    |  2 +-
 app/views/groups/issues.html.haml             |  2 +-
 app/views/groups/merge_requests.html.haml     |  2 +-
 app/views/groups/milestones/index.html.haml   |  2 +-
 app/views/help/ui.html.haml                   |  6 ++---
 app/views/projects/_last_push.html.haml       |  2 +-
 app/views/projects/_readme.html.haml          |  2 +-
 app/views/projects/artifacts/browse.html.haml |  2 +-
 app/views/projects/branches/index.html.haml   |  2 +-
 app/views/projects/builds/index.html.haml     |  3 ++-
 app/views/projects/builds/show.html.haml      |  4 ++--
 app/views/projects/ci/builds/_build.html.haml |  3 ++-
 .../projects/commit/_ci_commit.html.haml      |  6 +++--
 .../projects/commit/_commit_box.html.haml     | 24 +++++++++----------
 app/views/projects/commits/show.html.haml     |  2 +-
 app/views/projects/compare/index.html.haml    |  2 +-
 app/views/projects/compare/show.html.haml     |  2 +-
 app/views/projects/empty.html.haml            |  2 +-
 app/views/projects/graphs/ci.html.haml        |  2 +-
 app/views/projects/graphs/commits.html.haml   |  2 +-
 app/views/projects/graphs/languages.html.haml |  2 +-
 app/views/projects/graphs/show.html.haml      |  2 +-
 app/views/projects/network/_head.html.haml    |  2 +-
 app/views/projects/releases/edit.html.haml    |  2 +-
 app/views/projects/show.html.haml             |  2 +-
 app/views/projects/snippets/index.html.haml   |  2 +-
 app/views/projects/tags/index.html.haml       |  2 +-
 app/views/projects/tags/show.html.haml        |  2 +-
 app/views/projects/wikis/git_access.html.haml |  2 +-
 app/views/search/_results.html.haml           |  2 +-
 app/views/shared/issuable/_filter.html.haml   |  4 ++--
 app/views/shared/issuable/_form.html.haml     |  2 +-
 app/views/shared/milestones/_top.html.haml    |  2 +-
 app/views/shared/snippets/_header.html.haml   |  2 +-
 .../sherlock/file_samples/show.html.haml      |  2 +-
 app/views/sherlock/queries/show.html.haml     |  2 +-
 .../sherlock/transactions/index.html.haml     |  2 +-
 .../sherlock/transactions/show.html.haml      |  2 +-
 app/views/users/show.html.haml                |  2 +-
 55 files changed, 118 insertions(+), 85 deletions(-)

diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index e72e4aa47ef..af6f22da281 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -18,7 +18,7 @@
   line-height: 36px;
 }
 
-.gray-content-block {
+.row-content-block {
   margin-top: 0;
   margin-bottom: -$gl-padding;
   background-color: $background-color;
@@ -81,6 +81,11 @@
       margin-left: 10px;
     }
   }
+
+  &.build-content {
+    background-color: $white-light;
+    border-top: none;
+  }
 }
 
 .cover-block {
@@ -113,7 +118,7 @@
     line-height: 1.1;
 
     h1 {
-      color: #313236;
+      color: $gl-gray-dark;
       margin-bottom: 6px;
       font-size: 23px;
     }
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 062da397b6b..edb5ee71f98 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -59,7 +59,7 @@
 }
 
 @mixin btn-gray {
-  @include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, #313236);
+  @include btn-color($gray-light, $border-gray-light, $gray-normal, $border-gray-light, $gray-dark, $border-gray-dark, $gl-gray-dark);
 }
 
 @mixin btn-white {
diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss
index 96bab7880c2..6a45c34ccbb 100644
--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -81,7 +81,7 @@
 
 // Labels
 .label {
-  padding: 2px 4px;
+  padding: 4px 5px;
   font-size: 13px;
   font-style: normal;
   font-weight: normal;
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index b2535ddf4bd..2779cd56788 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -42,14 +42,14 @@
     margin: 24px 0 12px;
     padding: 0 0 10px;
     border-bottom: 1px solid #e7e9ed;
-    color: #313236;
+    color: $gl-gray-dark;
   }
 
   h2 {
     font-size: 1.2em;
     font-weight: 600;
     margin: 24px 0 12px;
-    color: #313236;
+    color: $gl-gray-dark;
   }
 
   h3 {
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 92ecfe50488..4227839eed3 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -20,7 +20,7 @@ $background-color:   #fafafa;
  */
 $gl-font-size:         15px;
 $gl-title-color:       #333;
-$gl-text-color:        #555;
+$gl-text-color:        #5c5c5c;
 $gl-text-green:        #4a2;
 $gl-text-red:          #d12f19;
 $gl-text-orange:       #d90;
@@ -30,6 +30,7 @@ $gl-placeholder-color: #8f8f8f;
 $gl-icon-color:        $gl-placeholder-color;
 $gl-grayish-blue:      #7f8fa4;
 $gl-gray:              $gl-text-color;
+$gl-gray-dark:         #313236;
 $gl-header-color:      $gl-title-color;
 
 /*
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 358d2f4ab9d..5c945e2d4c9 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -31,9 +31,17 @@
   }
   .commit-committer-link,
   .commit-author-link {
-    color: #444;
+    color: $gl-gray;
     font-weight: bold;
   }
+
+  .ci-status {
+    margin-right: 10px;
+  }
+
+  .fa-clipboard {
+    color: $dropdown-title-btn-color;
+  }
 }
 
 .commit-box {
@@ -42,7 +50,7 @@
   .commit-title {
     margin: 0;
     font-size: 23px;
-    color: #313236;
+    color: $gl-gray-dark;
   }
 
   .commit-description {
diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss
index 3438dbe4958..5e61e61d85c 100644
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -22,7 +22,7 @@
   .title {
     margin: 0;
     font-size: 23px;
-    color: #313236;
+    color: $gl-gray-dark;
   }
 
   .description {
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 4ef548ffbe7..c4005ba1e69 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -104,7 +104,7 @@
       font-weight: 600;
       font-size: 17px;
       margin: 5px 0;
-      color: #313236;
+      color: $gl-gray-dark;
     }
 
     p:last-child {
@@ -136,7 +136,7 @@
 }
 
 .label-branch {
-  color: #313236;
+  color: $gl-gray-dark;
   font-family: $monospace_font;
   font-weight: bold;
   overflow: hidden;
@@ -272,3 +272,19 @@
   display: inline-block;
   width: 250px;
 }
+
+.table-holder {
+  .builds {
+
+    th {
+      background-color: $white-light;
+      color: $gl-placeholder-color;
+    }
+
+    th,
+    td {
+      padding: 16px;
+    }
+  }
+}
+
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 99108e9bfc4..c20f04653fc 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -178,7 +178,7 @@
     .option-title {
       font-weight: normal;
       display: inline-block;
-      color: #313236;
+      color: $gl-gray-dark;
     }
 
     .option-descr {
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index 3571eefd570..84b78a6f36a 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -35,15 +35,15 @@
   %td
     #{build.stage} / #{build.name}
 
-    .pull-right
-      - if build.tags.any?
-        - build.tags.each do |tag|
-          %span.label.label-primary
-            = tag
-      - if build.try(:trigger_request)
-        %span.label.label-info triggered
-      - if build.try(:allow_failure)
-        %span.label.label-danger allowed to fail
+  %td
+    - if build.tags.any?
+      - build.tags.each do |tag|
+        %span.label.label-primary
+          = tag
+    - if build.try(:trigger_request)
+      %span.label.label-info triggered
+    - if build.try(:allow_failure)
+      %span.label.label-danger allowed to fail
 
   %td.duration
     - if build.duration
@@ -69,4 +69,4 @@
             %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
-            %i.fa.fa-repeat
+            %i.fa.fa-refresh
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
index 5931efdefe6..804d7851bdb 100644
--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -19,7 +19,7 @@
     - if @all_builds.running_or_pending.any?
       = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
 
-.gray-content-block.second-block
+.row-content-block.second-block
   #{(@scope || 'running').capitalize} builds
 
 %ul.content-list
@@ -38,6 +38,7 @@
             %th Ref
             %th Runner
             %th Name
+            %th Tags
             %th Duration
             %th Finished at
             %th
diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml
index 4b475a4d8fa..698feb571ac 100644
--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
@@ -7,7 +7,7 @@
     %li{ class: (klass == Gitlab::GitLogger ? 'active' : '') }
       = link_to klass::file_name, "##{klass::file_name_noext}",
           'data-toggle' => 'tab'
-.gray-content-block
+.row-content-block
   To prevent performance issues admin logs output the last 2000 lines
 .tab-content
   - loggers.each do |klass|
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index 0ee8dc962b9..d6743081c8e 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -32,7 +32,7 @@
         Without projects
         %small.badge= number_with_delimiter(User.without_projects.count)
 
-  .gray-content-block.second-block
+  .row-content-block.second-block
     .pull-right
       .dropdown.inline
         %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml
index 49ab8aad1d5..e27fefc0afd 100644
--- a/app/views/dashboard/todos/index.html.haml
+++ b/app/views/dashboard/todos/index.html.haml
@@ -25,7 +25,7 @@
         = icon('spinner spin')
 
 .todos-filters
-  .gray-content-block.second-block
+  .row-content-block.second-block
     = form_tag todos_filter_path(without: [:project_id, :author_id, :type, :action_id]), method: :get, class: 'filter-form' do
       .filter-item.inline
         = select_tag('project_id', todo_projects_options,
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml
index 5753158c24d..a1a282178e7 100644
--- a/app/views/events/_event_last_push.html.haml
+++ b/app/views/events/_event_last_push.html.haml
@@ -1,5 +1,5 @@
 - if show_last_push_widget?(event)
-  .gray-content-block.clear-block.last-push-widget
+  .row-content-block.clear-block.last-push-widget
     .event-last-push
       .event-last-push-text
         %span You pushed to
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index 8ffca96bb4e..57f6e7e0612 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -6,7 +6,7 @@
 - else
   = render 'explore/head'
 
-.gray-content-block.clearfix
+.row-content-block.clearfix
   .pull-left
     = form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
       = hidden_field_tag :sort, @sort
diff --git a/app/views/explore/snippets/index.html.haml b/app/views/explore/snippets/index.html.haml
index 0f100c39ffb..9b838b9f3b7 100644
--- a/app/views/explore/snippets/index.html.haml
+++ b/app/views/explore/snippets/index.html.haml
@@ -6,7 +6,7 @@
 - else
   = render 'explore/head'
 
-.gray-content-block
+.row-content-block
   - if current_user
     .pull-right
       = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml
index aea35c50862..df6db8c23d3 100644
--- a/app/views/groups/issues.html.haml
+++ b/app/views/groups/issues.html.haml
@@ -16,7 +16,7 @@
 
 = render 'shared/issuable/filter', type: :issues
 
-.gray-content-block.second-block
+.row-content-block.second-block
   Only issues from
   %strong #{@group.name}
   group are listed here.
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index e1c9dd931ee..0cc2305b7d7 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -8,7 +8,7 @@
 
 = render 'shared/issuable/filter', type: :merge_requests
 
-.gray-content-block.second-block
+.row-content-block.second-block
   Only merge requests from
   %strong #{@group.name}
   group are listed here.
diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml
index ab307708b75..ddb8be0d496 100644
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@@ -10,7 +10,7 @@
         = icon('plus')
         New Milestone
 
-.gray-content-block
+.row-content-block
   Only milestones from
   %strong #{@group.name}
   group are listed here.
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml
index f12df5c8ffe..d676bc28c89 100644
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -48,14 +48,14 @@
 
   .lead
     Gray content block with side padding using
-    %code .gray-content-block
+    %code .row-content-block
 
   .example
-    .gray-content-block
+    .row-content-block
       %h4 Normal block inside content
       = lorem
 
-    .gray-content-block.second-block
+    .row-content-block.second-block
       %h4 Second block
       = lorem
 
diff --git a/app/views/projects/_last_push.html.haml b/app/views/projects/_last_push.html.haml
index f0a3e416db7..7c2b8d01508 100644
--- a/app/views/projects/_last_push.html.haml
+++ b/app/views/projects/_last_push.html.haml
@@ -1,7 +1,7 @@
 - if event = last_push_event
   - if show_last_push_widget?(event)
 
-    .gray-content-block.top-block.clear-block.hidden-xs
+    .row-content-block.top-block.clear-block.hidden-xs
       .event-last-push
         .event-last-push-text
           %span You pushed to
diff --git a/app/views/projects/_readme.html.haml b/app/views/projects/_readme.html.haml
index a9908eaecca..369a847e7d4 100644
--- a/app/views/projects/_readme.html.haml
+++ b/app/views/projects/_readme.html.haml
@@ -7,7 +7,7 @@
       = cache(readme_cache_key) do
         = render_readme(readme)
 - else
-  .gray-content-block.second-block.center
+  .row-content-block.second-block.center
     %h3.page-title
       This project does not have a README yet
     - if can?(current_user, :push_code, @project)
diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml
index 84034c8bf16..49f95ff37db 100644
--- a/app/views/projects/artifacts/browse.html.haml
+++ b/app/views/projects/artifacts/browse.html.haml
@@ -1,7 +1,7 @@
 - page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Builds'
 = render 'projects/builds/header_title'
 
-.top-block.gray-content-block.clearfix
+.top-block.row-content-block.clearfix
   .pull-right
     = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, @build),
       class: 'btn btn-default download' do
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 88266e21230..ac7790421a4 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -1,7 +1,7 @@
 - page_title "Branches"
 = render "projects/commits/header_title"
 = render "projects/commits/head"
-.gray-content-block
+.row-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
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index 0406fc21d77..d842dd54e6b 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -34,7 +34,7 @@
         = icon('wrench')
         %span CI Lint
 
-.gray-content-block
+.row-content-block
   #{(@scope || 'running').capitalize} builds from this project
 
 %ul.content-list
@@ -52,6 +52,7 @@
             %th Ref
             %th Stage
             %th Name
+            %th Tags
             %th Duration
             %th Finished at
             - if @project.build_coverage_enabled?
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index 99d72aa7935..c0f7a7686f0 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 
 .build-page
-  .gray-content-block.top-block
+  .row-content-block.top-block
     Build ##{@build.id} for commit
     %strong.monospace= link_to @build.commit.short_sha, ci_status_path(@build.commit)
     from
@@ -34,7 +34,7 @@
             %i.fa.fa-warning
             This build was retried.
 
-  .gray-content-block.middle-block
+  .row-content-block.middle-block
     .build-head
       .clearfix
         = ci_status_with_icon(@build.status)
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index e123eb1cc7a..e5a5efb3153 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -40,6 +40,7 @@
   %td
     = build.name
 
+  %td
     .label-container
       - if build.tags.any?
         - build.tags.each do |tag|
@@ -76,4 +77,4 @@
             %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
-            %i.fa.fa-repeat
+            %i.fa.fa-refresh
diff --git a/app/views/projects/commit/_ci_commit.html.haml b/app/views/projects/commit/_ci_commit.html.haml
index d3acd33116c..e849aefb188 100644
--- a/app/views/projects/commit/_ci_commit.html.haml
+++ b/app/views/projects/commit/_ci_commit.html.haml
@@ -1,4 +1,4 @@
-.gray-content-block.middle-block
+.row-content-block.build-content.middle-block
   .pull-right
     - if can?(current_user, :update_build, @project)
       - if ci_commit.builds.latest.failed.any?(&:retryable?)
@@ -40,6 +40,7 @@
         %th Build ID
         %th Stage
         %th Name
+        %th Tags
         %th Duration
         %th Finished at
         - if @project.build_coverage_enabled?
@@ -49,7 +50,7 @@
     = render builds, coverage: @project.build_coverage_enabled?, stage: true, ref: false, allow_retry: true
 
 - if ci_commit.retried.any?
-  .gray-content-block.second-block
+  .row-content-block.second-block
     Retried builds
 
   .table-holder
@@ -61,6 +62,7 @@
           %th Ref
           %th Stage
           %th Name
+          %th Tags
           %th Duration
           %th Finished at
           - if @project.build_coverage_enabled?
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml
index 3d7c18a5f58..b73cbf3f1d8 100644
--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -22,10 +22,12 @@
   %div
 
 %p
-  %span.light Commit
-  = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
-  = clipboard_button(clipboard_text: @commit.id)
 .commit-info-row
+  - if @commit.status
+    = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status ci-#{@commit.status}" do
+      = ci_icon_for_status(@commit.status)
+      build:
+      = ci_label_for_status(@commit.status)
   %span.light Authored by
   %strong
     = commit_author_link(@commit, avatar: true, size: 24)
@@ -39,19 +41,15 @@
     #{time_ago_with_tooltip(@commit.committed_date)}
 
 .commit-info-row
+  %span.light Commit
+  = link_to @commit.id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
+  = clipboard_button(clipboard_text: @commit.id)
   %span.cgray= pluralize(@commit.parents.count, "parent")
   - @commit.parents.each do |parent|
     = link_to parent.short_id, namespace_project_commit_path(@project.namespace, @project, parent), class: "monospace"
 
-- if @commit.status
-  .pull-right
-    = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "ci-status ci-#{@commit.status}" do
-      = ci_icon_for_status(@commit.status)
-      build:
-      = ci_label_for_status(@commit.status)
-
-.commit-info-row.branches
-  %i.fa.fa-spinner.fa-spin
+  %span.commit-info.branches
+    %i.fa.fa-spinner.fa-spin
 
 .commit-box.content-block
   %h3.commit-title
@@ -61,4 +59,4 @@
       = preserve(markdown(escape_once(@commit.description), pipeline: :single_line))
 
 :javascript
-  $(".commit-info-row.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");
+  $(".commit-info.branches").load("#{branches_namespace_project_commit_path(@project.namespace, @project, @commit.id)}");
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index bcdb09208aa..088eaa28013 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -6,7 +6,7 @@
 
 = render "head"
 
-.gray-content-block.second-block
+.row-content-block.second-block
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'commits'
 
diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index 02be5a2d07f..5e188dd0f3c 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -2,7 +2,7 @@
 = render "projects/commits/header_title"
 = render "projects/commits/head"
 
-.gray-content-block
+.row-content-block
   Compare branches, tags or commit ranges.
   %br
   Fill input field with commit id like
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index da731f28bb6..62525168239 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -3,7 +3,7 @@
 = render "projects/commits/head"
 
 
-.gray-content-block
+.row-content-block
   = render "form"
 
 - if @commits.present?
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 52d093871b4..1a2e59752fe 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -7,7 +7,7 @@
 
 = render "home_panel"
 
-.gray-content-block.second-block.center
+.row-content-block.second-block.center
   %h3.page-title
     The repository for this project is empty
   - if can?(current_user, :push_code, @project)
diff --git a/app/views/projects/graphs/ci.html.haml b/app/views/projects/graphs/ci.html.haml
index 6fa77cc10c6..9f05be9982b 100644
--- a/app/views/projects/graphs/ci.html.haml
+++ b/app/views/projects/graphs/ci.html.haml
@@ -1,7 +1,7 @@
 - page_title "Continuous Integration", "Graphs"
 = render "header_title"
 = render 'head'
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .oneline
     A collection of graphs for Continuous Integration
 
diff --git a/app/views/projects/graphs/commits.html.haml b/app/views/projects/graphs/commits.html.haml
index fc465ab273b..da9f648cc9c 100644
--- a/app/views/projects/graphs/commits.html.haml
+++ b/app/views/projects/graphs/commits.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 = render 'head'
 
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'graphs_commits'
   %ul.breadcrumb.repo-breadcrumb
diff --git a/app/views/projects/graphs/languages.html.haml b/app/views/projects/graphs/languages.html.haml
index a7fab5b6d72..ebecab1dbfc 100644
--- a/app/views/projects/graphs/languages.html.haml
+++ b/app/views/projects/graphs/languages.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 = render 'head'
 
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .oneline
     Programming languages used in this repository
 
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 882e7d6b6ee..ad4a932d391 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 = render 'head'
 
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .tree-ref-holder
     = render 'shared/ref_switcher', destination: 'graphs'
   %ul.breadcrumb.repo-breadcrumb
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml
index 28a617538b5..c609c505def 100644
--- a/app/views/projects/network/_head.html.haml
+++ b/app/views/projects/network/_head.html.haml
@@ -1,4 +1,4 @@
-.gray-content-block.append-bottom-default
+.row-content-block.append-bottom-default
   .tree-ref-holder
     = render partial: 'shared/ref_switcher', locals: {destination: 'graph'}
 
diff --git a/app/views/projects/releases/edit.html.haml b/app/views/projects/releases/edit.html.haml
index 6f0b32aa165..0d59cec322c 100644
--- a/app/views/projects/releases/edit.html.haml
+++ b/app/views/projects/releases/edit.html.haml
@@ -2,7 +2,7 @@
 = render "projects/commits/header_title"
 = render "projects/commits/head"
 
-.gray-content-block
+.row-content-block
   .oneline
     .title
       Release notes for tag
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index d854ac21725..74feb9e3282 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -12,7 +12,7 @@
 = render 'projects/last_push'
 = render "home_panel"
 
-.project-stats.gray-content-block.second-block
+.project-stats.row-content-block.second-block
   %ul.nav
     %li
       = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml
index 4af963e14da..103ff447464 100644
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
@@ -1,7 +1,7 @@
 - page_title "Snippets"
 = render "header_title"
 
-.gray-content-block.top-block
+.row-content-block.top-block
   .pull-right
     = link_to new_namespace_project_snippet_path(@project.namespace, @project), class: "btn btn-new", title: "New Snippet" do
       = icon('plus')
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 760347de0a9..dc6ece30dd2 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -2,7 +2,7 @@
 = render "projects/commits/header_title"
 = render "projects/commits/head"
 
-.gray-content-block
+.row-content-block
   - if can? current_user, :push_code, @project
     .pull-right
       = link_to new_namespace_project_tag_path(@project.namespace, @project), class: 'btn btn-create new-tag-btn' do
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index 1dc9b799a95..9c916fd02de 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -2,7 +2,7 @@
 = render "projects/commits/header_title"
 = render "projects/commits/head"
 
-.gray-content-block
+.row-content-block
   .pull-right
     - if can?(current_user, :push_code, @project)
       = link_to edit_namespace_project_tag_release_path(@project.namespace, @project, @tag.name), class: 'btn-grouped btn has-tooltip', title: 'Edit release notes' do
diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml
index dd27ea2b11b..ba3f2cadc48 100644
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"
 
 = render 'nav'
-.gray-content-block
+.row-content-block
   %span.oneline
     Git access for
     %strong= @project_wiki.path_with_namespace
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml
index 711337f308e..252c37532e1 100644
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -1,7 +1,7 @@
 - if @search_objects.empty?
   = render partial: "search/results/empty"
 - else
-  .gray-content-block
+  .row-content-block
     = search_entries_info(@search_objects, @scope, @search_term)
     - unless @show_snippets
       - if @project
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index fc1101646fb..9474462cbd1 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -1,5 +1,5 @@
 .issues-filters
-  .issues-details-filters.gray-content-block.second-block
+  .issues-details-filters.row-content-block.second-block
     = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name]), method: :get, class: 'filter-form' do
       - if controller.controller_name == 'issues' && can?(current_user, :admin_issue, @project)
         .check-all-holder
@@ -48,7 +48,7 @@
             = button_tag "Update issues", class: "btn update_selected_issues btn-save"
 
   - if !@labels.nil?
-    .gray-content-block.second-block.filtered-labels{ class: ("hidden" if !@labels.any?) }
+    .row-content-block.second-block.filtered-labels{ class: ("hidden" if !@labels.any?) }
       - if @labels.any?
         = render "shared/labels_row", labels: @labels
 
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 18b091df39b..5c52cc6d1da 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -116,7 +116,7 @@
         = link_to 'Change branches', mr_change_branches_path(@merge_request)
 
 - is_footer = !(issuable.is_a?(MergeRequest) && issuable.new_record?)
-.gray-content-block{class: (is_footer ? "footer-block" : "middle-block")}
+.row-content-block{class: (is_footer ? "footer-block" : "middle-block")}
   - if issuable.new_record?
     = f.submit "Submit #{issuable.class.model_name.human.downcase}", class: 'btn btn-create'
   - else
diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml
index 7ff947a51db..8bca971bcf2 100644
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
@@ -24,7 +24,7 @@
         - else
           = link_to 'Reopen Milestone', group_milestone_path(group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
 
-.detail-page-description.milestone-detail
+.detail-page-description.milestone-detailrow-content-block.second-block
   %h2.title
     = markdown escape_once(milestone.title), pipeline: :single_line
 
diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml
index 3c445f67236..e65b1814872 100644
--- a/app/views/shared/snippets/_header.html.haml
+++ b/app/views/shared/snippets/_header.html.haml
@@ -20,6 +20,6 @@
     - else
       = render "snippets/actions"
 
-.detail-page-description.gray-content-block.second-block
+.detail-page-description.row-content-block.second-block
   %h2.title
     = markdown escape_once(@snippet.title), pipeline: :single_line
diff --git a/app/views/sherlock/file_samples/show.html.haml b/app/views/sherlock/file_samples/show.html.haml
index cfd11e45b6a..94d4dd4fa7d 100644
--- a/app/views/sherlock/file_samples/show.html.haml
+++ b/app/views/sherlock/file_samples/show.html.haml
@@ -3,7 +3,7 @@
 
 - header_title t('sherlock.title'), sherlock_transactions_path
 
-.gray-content-block
+.row-content-block
   .pull-right
     = link_to(sherlock_transaction_path(@transaction), class: 'btn') do
       %i.fa.fa-arrow-left
diff --git a/app/views/sherlock/queries/show.html.haml b/app/views/sherlock/queries/show.html.haml
index 83f61ce4b07..fc2863dca8e 100644
--- a/app/views/sherlock/queries/show.html.haml
+++ b/app/views/sherlock/queries/show.html.haml
@@ -9,7 +9,7 @@
     %a(href="#tab-backtrace" data-toggle="tab")
       = t('sherlock.backtrace')
 
-.gray-content-block
+.row-content-block
   .pull-right
     = link_to(sherlock_transaction_path(@transaction), class: 'btn') do
       %i.fa.fa-arrow-left
diff --git a/app/views/sherlock/transactions/index.html.haml b/app/views/sherlock/transactions/index.html.haml
index 010e1a2a902..da969c02765 100644
--- a/app/views/sherlock/transactions/index.html.haml
+++ b/app/views/sherlock/transactions/index.html.haml
@@ -1,7 +1,7 @@
 - page_title t('sherlock.title')
 - header_title t('sherlock.title'), sherlock_transactions_path
 
-.gray-content-block
+.row-content-block
   .pull-right
     = link_to(destroy_all_sherlock_transactions_path,
       class: 'btn btn-danger',
diff --git a/app/views/sherlock/transactions/show.html.haml b/app/views/sherlock/transactions/show.html.haml
index 9d4b0b2724c..8aa6b437d95 100644
--- a/app/views/sherlock/transactions/show.html.haml
+++ b/app/views/sherlock/transactions/show.html.haml
@@ -16,7 +16,7 @@
       %span.badge
         #{@transaction.file_samples.length}
 
-.gray-content-block
+.row-content-block
   .pull-right
     = link_to(sherlock_transactions_path, class: 'btn') do
       %i.fa.fa-arrow-left
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 03511b0654f..3c0b89c6741 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -85,7 +85,7 @@
   %div{ class: container_class }
     .tab-content
       #activity.tab-pane
-        .gray-content-block.calender-block.white.second-block.hidden-xs
+        .row-content-block.calender-block.white.second-block.hidden-xs
           %div{ class: container_class }
             .user-calendar{data: {href: user_calendar_path}}
               %h4.center.light

From fc20639c8d76b367dc0e0b66ef94033697b28dc7 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Tue, 26 Apr 2016 13:20:58 -0500
Subject: [PATCH 2/4] Builds page redesign

---
 app/assets/stylesheets/framework/buttons.scss  |  6 ++++++
 app/assets/stylesheets/pages/builds.scss       | 13 +++++++++++++
 app/assets/stylesheets/pages/commit.scss       | 18 ++++++++++++++++--
 app/assets/stylesheets/pages/status.scss       |  2 +-
 app/helpers/application_helper.rb              |  3 +--
 app/views/admin/builds/_build.html.haml        |  2 +-
 app/views/dashboard/snippets/index.html.haml   | 16 ++++++++--------
 app/views/dashboard/todos/index.html.haml      |  8 ++++----
 app/views/projects/builds/index.html.haml      | 13 +++++++------
 app/views/projects/ci/builds/_build.html.haml  |  2 +-
 app/views/projects/commit/_ci_menu.html.haml   |  4 ++--
 .../projects/commit/_commit_box.html.haml      |  2 +-
 app/views/projects/commit/branches.html.haml   |  1 -
 app/views/projects/commits/_head.html.haml     |  9 ++++++---
 .../projects/merge_requests/_show.html.haml    | 12 ++++++++----
 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

From 3a3f0bf436007b3eecc0b85d0fc696951245ab6a Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 27 Apr 2016 09:46:31 -0500
Subject: [PATCH 3/4] Change build icons into buttons; update tests

---
 app/assets/stylesheets/framework/buttons.scss |  3 ++-
 app/assets/stylesheets/pages/builds.scss      |  4 ----
 app/views/admin/builds/_build.html.haml       |  6 +++---
 app/views/projects/ci/builds/_build.html.haml |  6 +++---
 features/project/merge_requests.feature       |  8 ++++----
 features/steps/dashboard/todos.rb             |  8 ++++----
 features/steps/project/merge_requests.rb      | 10 +++++-----
 spec/features/notes_on_merge_requests_spec.rb |  2 +-
 8 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 1f2f9f7754c..eaf85bb17ca 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -252,7 +252,8 @@
   background: linear-gradient(180deg, $white-light 25%, $gray-light 100%);
 }
 
-.btn-refresh {
+.btn-build {
+  margin-left: 10px;
   i {
     color: $gl-icon-color;
   }
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 3340cee9643..aa41565f812 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -91,8 +91,4 @@ table.builds {
       color: $gl-dark-link-color;
     }
   }
-
-  .btn-refresh {
-    margin-left: 10px;
-  }
 }
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index 2b99f360d6f..967151bc33b 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -61,12 +61,12 @@
   %td
     .pull-right
       - if can?(current_user, :read_build, project) && build.artifacts?
-        = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts' do
+        = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts', class: 'btn btn-build' do
           %i.fa.fa-download
       - if can?(current_user, :update_build, build.project)
         - if build.active?
-          = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel' do
+          = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' 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', class: 'btn btn-refresh' 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-build' do
             %i.fa.fa-refresh
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 1b382e48365..8e95f040273 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -69,12 +69,12 @@
   %td
     .pull-right
       - if can?(current_user, :read_build, build) && build.artifacts?
-        = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts' do
+        = link_to download_namespace_project_build_artifacts_path(build.project.namespace, build.project, build), title: 'Download artifacts', class: 'btn btn-build' do
           %i.fa.fa-download
       - if can?(current_user, :update_build, build)
         - if build.active?
-          = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel' do
+          = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' 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', class: 'btn btn-refresh' 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-build' do
             %i.fa.fa-refresh
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index ecda4ea8240..aec590f7d9e 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -135,7 +135,7 @@ Feature: Project Merge Requests
     And I leave a comment like "Line is wrong" on diff
     And I switch to the merge request's comments tab
     Then I should see a discussion has started on diff
-    And I should see a badge of "1" next to the discussion link
+    And I should see a badge of "(1)" next to the discussion link
 
   @javascript
   Scenario: I see a new comment on merge request diff from another user in the discussion tab
@@ -143,7 +143,7 @@ Feature: Project Merge Requests
     And I visit merge request page "Bug NS-05"
     And user "John Doe" leaves a comment like "Line is wrong" on diff
     Then I should see a discussion by user "John Doe" has started on diff
-    And I should see a badge of "1" next to the discussion link
+    And I should see a badge of "(1)" next to the discussion link
 
   @javascript
   Scenario: I edit a comment on a merge request diff
@@ -161,11 +161,11 @@ Feature: Project Merge Requests
     And I visit merge request page "Bug NS-05"
     And I click on the Changes tab
     And I leave a comment like "Line is wrong" on diff
-    And I should see a badge of "1" next to the discussion link
+    And I should see a badge of "(1)" next to the discussion link
     And I delete the comment "Line is wrong" on diff
     And I click on the Discussion tab
     Then I should not see any discussion
-    And I should see a badge of "0" next to the discussion link
+    And I should see a badge of "(0)" next to the discussion link
 
   @javascript
   Scenario: I comment on a line of a commit in merge request
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index 2b23df6764b..da380250cd7 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -27,8 +27,8 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
 
   step 'I should see todos assigned to me' do
     page.within('.nav-sidebar') { expect(page).to have_content 'Todos 4' }
-    expect(page).to have_content 'To do 4'
-    expect(page).to have_content 'Done 0'
+    expect(page).to have_content 'To do (4)'
+    expect(page).to have_content 'Done (0)'
 
     expect(page).to have_link project.name_with_namespace
     should_see_todo(1, "John Doe assigned you merge request #{merge_request.to_reference}", merge_request.title)
@@ -43,8 +43,8 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
     end
 
     page.within('.nav-sidebar') { expect(page).to have_content 'Todos 3' }
-    expect(page).to have_content 'To do 3'
-    expect(page).to have_content 'Done 1'
+    expect(page).to have_content 'To do (3)'
+    expect(page).to have_content 'Done (1)'
     should_not_see_todo "John Doe assigned you merge request #{merge_request.to_reference}"
   end
 
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 3b1a00f628a..463235742fb 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -344,12 +344,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
-  step 'I should see a badge of "1" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("1")
+  step 'I should see a badge of "(1)" next to the discussion link' do
+    expect_discussion_badge_to_have_counter("(1)")
   end
 
-  step 'I should see a badge of "0" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("0")
+  step 'I should see a badge of "(0)" next to the discussion link' do
+    expect_discussion_badge_to_have_counter("(0)")
   end
 
   step 'I should see a discussion has started on commit diff' do
@@ -572,7 +572,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   def expect_discussion_badge_to_have_counter(value)
-    page.within(".notes-tab .badge") do
+    page.within(".notes-tab span") do
       page.should have_content value
     end
   end
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 389812ff7e1..0aef4cba238 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -151,7 +151,7 @@ describe 'Comments', feature: true do
         visit namespace_project_merge_request_path(project.namespace, project, merge_request)
 
         expect(merge_request.mr_and_commit_notes.count).to eq 2
-        expect(find('.notes-tab span.badge').text).to eq "1"
+        expect(find('.notes-tab span').text).to eq "(1)"
       end
     end
   end

From 8d19955c05f18675fc16dee6ca0f4da24013e816 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone <annabel.dunstone@gmail.com>
Date: Wed, 4 May 2016 16:25:10 -0500
Subject: [PATCH 4/4] Revert counter parentheses back to badges

---
 app/helpers/application_helper.rb                |  3 ++-
 app/views/dashboard/snippets/index.html.haml     | 16 ++++++++--------
 app/views/dashboard/todos/index.html.haml        |  8 ++++----
 app/views/projects/builds/index.html.haml        | 12 ++++++------
 app/views/projects/commit/_ci_menu.html.haml     |  4 ++--
 app/views/projects/commits/_head.html.haml       | 10 ++++------
 .../projects/merge_requests/_show.html.haml      | 12 ++++--------
 app/views/shared/milestones/_top.html.haml       |  2 +-
 features/project/merge_requests.feature          |  8 ++++----
 features/steps/dashboard/todos.rb                |  8 ++++----
 features/steps/project/merge_requests.rb         | 10 +++++-----
 spec/features/notes_on_merge_requests_spec.rb    |  2 +-
 12 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 313a8fd56c5..3e0074da394 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -316,7 +316,8 @@ module ApplicationHelper
     html = content_tag :span, entity_title
 
     if count.present?
-      html += content_tag :span, " (#{number_with_delimiter(count)})"
+      html += " "
+      html += content_tag :span, number_with_delimiter(count), class: 'badge'
     end
 
     html.html_safe
diff --git a/app/views/dashboard/snippets/index.html.haml b/app/views/dashboard/snippets/index.html.haml
index 53f1094ec07..d4e7862981c 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
-          (#{current_user.snippets.count})
+        %span.badge
+          = current_user.snippets.count
 
     %li{ class: ("active" if params[:scope] == "are_private") }
       = link_to dashboard_snippets_path(scope: 'are_private') do
         Private
-        %span
-          (#{current_user.snippets.are_private.count})
+        %span.badge
+          = 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
-          (#{current_user.snippets.are_internal.count})
+        %span.badge
+          = 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
-          (#{current_user.snippets.are_public.count})
+        %span.badge
+          = 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 a87b796c6f3..fc42e5dcc66 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
-          (#{todos_pending_count})
+        %span.badge
+          = 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
-          (#{todos_done_count})
+        %span.badge
+          = 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 fcb1e656d72..2e8015d119b 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -6,21 +6,21 @@
     %li{class: ('active' if @scope.nil?)}
       = link_to project_builds_path(@project) do
         All
-        %span.js-totalbuilds-count
-          (#{number_with_delimiter(@all_builds.count(:id))})
+        %span.badge.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.js-running-count
-          (#{number_with_delimiter(@all_builds.running_or_pending.count(:id))})
+        %span.badge.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.js-running-count
-          (#{number_with_delimiter(@all_builds.finished.count(:id))})
+        %span.badge.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/commit/_ci_menu.html.haml b/app/views/projects/commit/_ci_menu.html.haml
index b2d3db0bdc6..ea33aa472a6 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 (#{@diffs.count})
+      %span.badge= @diffs.count
   = nav_link(path: 'commit#builds') do
     = link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id) do
       Builds
-      %span (#{@statuses.count})
+      %span.badge= @statuses.count
diff --git a/app/views/projects/commits/_head.html.haml b/app/views/projects/commits/_head.html.haml
index 2c8fecae760..d1bd76ab529 100644
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
@@ -2,8 +2,8 @@
   = nav_link(controller: [:commit, :commits]) do
     = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
       Commits
-      %span
-        (#{number_with_delimiter(@repository.commit_count)})
+      %span.badge
+        = number_with_delimiter(@repository.commit_count)
 
   = nav_link(controller: %w(network)) do
     = link_to namespace_project_network_path(@project.namespace, @project, current_ref) do
@@ -16,11 +16,9 @@
   = nav_link(html_options: {class: branches_tab_class}) do
     = link_to namespace_project_branches_path(@project.namespace, @project) do
       Branches
-      %span.js-totalbranch-count
-        (#{@repository.branch_count})
+      %span.badge.js-totalbranch-count= @repository.branch_count
 
   = nav_link(controller: [:tags, :releases]) do
     = link_to namespace_project_tags_path(@project.namespace, @project) do
       Tags
-      %span.js-totaltags-count
-        (#{@repository.tag_count})
+      %span.badge.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 0c97a29847d..290753d57c6 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -50,24 +50,20 @@
         %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
-              (#{@merge_request.mr_and_commit_notes.user.nonawards.count})
+            %span.badge= @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
-              (#{@commits.size})
+            %span.badge= @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
-                (#{@statuses.size})
+              %span.badge= @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
-              (#{@merge_request.diff_size})
+            %span.badge= @merge_request.diff_size
 
       .tab-content
         #notes.notes.tab-pane.voting_notes
diff --git a/app/views/shared/milestones/_top.html.haml b/app/views/shared/milestones/_top.html.haml
index 8bca971bcf2..7ff947a51db 100644
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
@@ -24,7 +24,7 @@
         - else
           = link_to 'Reopen Milestone', group_milestone_path(group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
 
-.detail-page-description.milestone-detailrow-content-block.second-block
+.detail-page-description.milestone-detail
   %h2.title
     = markdown escape_once(milestone.title), pipeline: :single_line
 
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index aec590f7d9e..ecda4ea8240 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -135,7 +135,7 @@ Feature: Project Merge Requests
     And I leave a comment like "Line is wrong" on diff
     And I switch to the merge request's comments tab
     Then I should see a discussion has started on diff
-    And I should see a badge of "(1)" next to the discussion link
+    And I should see a badge of "1" next to the discussion link
 
   @javascript
   Scenario: I see a new comment on merge request diff from another user in the discussion tab
@@ -143,7 +143,7 @@ Feature: Project Merge Requests
     And I visit merge request page "Bug NS-05"
     And user "John Doe" leaves a comment like "Line is wrong" on diff
     Then I should see a discussion by user "John Doe" has started on diff
-    And I should see a badge of "(1)" next to the discussion link
+    And I should see a badge of "1" next to the discussion link
 
   @javascript
   Scenario: I edit a comment on a merge request diff
@@ -161,11 +161,11 @@ Feature: Project Merge Requests
     And I visit merge request page "Bug NS-05"
     And I click on the Changes tab
     And I leave a comment like "Line is wrong" on diff
-    And I should see a badge of "(1)" next to the discussion link
+    And I should see a badge of "1" next to the discussion link
     And I delete the comment "Line is wrong" on diff
     And I click on the Discussion tab
     Then I should not see any discussion
-    And I should see a badge of "(0)" next to the discussion link
+    And I should see a badge of "0" next to the discussion link
 
   @javascript
   Scenario: I comment on a line of a commit in merge request
diff --git a/features/steps/dashboard/todos.rb b/features/steps/dashboard/todos.rb
index da380250cd7..2b23df6764b 100644
--- a/features/steps/dashboard/todos.rb
+++ b/features/steps/dashboard/todos.rb
@@ -27,8 +27,8 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
 
   step 'I should see todos assigned to me' do
     page.within('.nav-sidebar') { expect(page).to have_content 'Todos 4' }
-    expect(page).to have_content 'To do (4)'
-    expect(page).to have_content 'Done (0)'
+    expect(page).to have_content 'To do 4'
+    expect(page).to have_content 'Done 0'
 
     expect(page).to have_link project.name_with_namespace
     should_see_todo(1, "John Doe assigned you merge request #{merge_request.to_reference}", merge_request.title)
@@ -43,8 +43,8 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
     end
 
     page.within('.nav-sidebar') { expect(page).to have_content 'Todos 3' }
-    expect(page).to have_content 'To do (3)'
-    expect(page).to have_content 'Done (1)'
+    expect(page).to have_content 'To do 3'
+    expect(page).to have_content 'Done 1'
     should_not_see_todo "John Doe assigned you merge request #{merge_request.to_reference}"
   end
 
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 463235742fb..3b1a00f628a 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -344,12 +344,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
     end
   end
 
-  step 'I should see a badge of "(1)" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("(1)")
+  step 'I should see a badge of "1" next to the discussion link' do
+    expect_discussion_badge_to_have_counter("1")
   end
 
-  step 'I should see a badge of "(0)" next to the discussion link' do
-    expect_discussion_badge_to_have_counter("(0)")
+  step 'I should see a badge of "0" next to the discussion link' do
+    expect_discussion_badge_to_have_counter("0")
   end
 
   step 'I should see a discussion has started on commit diff' do
@@ -572,7 +572,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   def expect_discussion_badge_to_have_counter(value)
-    page.within(".notes-tab span") do
+    page.within(".notes-tab .badge") do
       page.should have_content value
     end
   end
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb
index 0aef4cba238..389812ff7e1 100644
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -151,7 +151,7 @@ describe 'Comments', feature: true do
         visit namespace_project_merge_request_path(project.namespace, project, merge_request)
 
         expect(merge_request.mr_and_commit_notes.count).to eq 2
-        expect(find('.notes-tab span').text).to eq "(1)"
+        expect(find('.notes-tab span.badge').text).to eq "1"
       end
     end
   end