Remove icons from tables; remove timestamp from pipelines, remove info block at top of pipelines

7 files changed, 3 insertions, 32 deletions

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index c70be58f48f..afb0cd1a1e6 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -281,7 +281,7 @@
 }
 
 .page-with-layout-nav {
-  margin-top: 50px;
+  margin-top: $header-height + 2;
 
   &.controls-dropdown-visible {
     @media (max-width: $screen-xs-min) {
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index c4005ba1e69..4f8a8748d3f 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -280,11 +280,5 @@
       background-color: $white-light;
       color: $gl-placeholder-color;
     }
-
-    th,
-    td {
-      padding: 16px;
-    }
   }
 }
-
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index ce917a471c7..6128868b670 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -1,6 +1,6 @@
 .pipelines {
   .stage {
-    max-width: 80px;
+    max-width: 100px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index e23a3782c6b..5bd6e3f0ebc 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -57,14 +57,10 @@
 
   %td.duration
     - if build.duration
-      = icon("clock-o")
-       
       #{duration_in_words(build.finished_at, build.started_at)}
 
   %td.timestamp
     - if build.finished_at
-      = icon("calendar")
-       
       %span #{time_ago_with_tooltip(build.finished_at)}
 
   - if defined?(coverage) && coverage
diff --git a/app/views/projects/ci/commits/_commit.html.haml b/app/views/projects/ci/commits/_commit.html.haml
index 9c63510d864..5b6b940a0c4 100644
--- a/app/views/projects/ci/commits/_commit.html.haml
+++ b/app/views/projects/ci/commits/_commit.html.haml
@@ -45,14 +45,7 @@
   %td
     - if commit.started_at && commit.finished_at
       %p.duration
-        = icon("clock-o")
-         
         #{duration_in_words(commit.finished_at, commit.started_at)}
-    - if commit.finished_at
-      %p.finished_at
-        = icon("calendar")
-         
-        #{time_ago_with_tooltip(commit.finished_at)}
 
   %td
     .controls.hidden-xs.pull-right
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index 8129514964a..8be124f387a 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -50,14 +50,10 @@
 
   %td.duration
     - if generic_commit_status.duration
-      = icon("clock-o")
-       
       #{duration_in_words(generic_commit_status.finished_at, generic_commit_status.started_at)}
 
   %td.timestamp
     - if generic_commit_status.finished_at
-      = icon("calendar")
-       
       %span #{time_ago_with_tooltip(generic_commit_status.finished_at)}
 
   - if defined?(coverage) && coverage
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml
index 4e2e8190700..a6c12814adf 100644
--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -36,14 +36,6 @@
         = icon('wrench')
         %span CI Lint
 
-.row-content-block
-  - if @scope == 'running'
-    Running pipelines for this project
-  - elsif @scope.nil?
-    Pipelines for this project
-  - else
-    #{@scope.titleize} for this project
-
 %ul.content-list.pipelines
   - stages = @pipelines.stages
   - if @pipelines.blank?
@@ -59,7 +51,7 @@
             %th.stage
               %span.has-tooltip{ title: "#{stage.titleize}" }
                 = stage.titleize.pluralize
-          %th
+          %th Duration
           %th
         = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages