Equal padding between table cells

2 files changed, 22 insertions, 51 deletions

diff --git a/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6 b/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6
index 3598da11573..d971588af96 100644
--- a/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6
@@ -55,21 +55,22 @@ require('../lib/utils/datetime_utility');
     },
     template: `
       <td>
-        <p class="duration" v-if='duration'>
-          <span v-html='svgs.iconTimer'></span>
-          {{duration}}
-        </p>
-        <p class="finished-at" v-if='timeStopped'>
-          <i class="fa fa-calendar"></i>
-          <time
-            data-toggle="tooltip"
-            data-placement="top"
-            data-container="body"
-            :data-original-title='localTimeFinished'
-          >
-            {{timeStopped.words}}
-          </time>
-        </p>
+        <div class="pull-right">
+          <p class="duration" v-if='duration'>
+            <span v-html='svgs.iconTimer'></span>
+            {{duration}}
+          </p>
+          <p class="finished-at" v-if='timeStopped'>
+            <i class="fa fa-calendar"></i>
+            <time
+              data-toggle="tooltip"
+              data-placement="top"
+              data-container="body"
+              :data-original-title='localTimeFinished'>
+              {{timeStopped.words}}
+            </time>
+          </p>
+        </div>
       </td>
     `,
   });
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index a9a967fdbfd..bc0382fb908 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -1,7 +1,4 @@
 .pipelines {
-  width: 100%;
-  overflow: auto;
-
   .realtime-loading {
     font-size: 40px;
     text-align: center;
@@ -16,17 +13,16 @@
     white-space: nowrap;
   }
 
-  .commit-title {
-    margin: 0;
+  .table-holder {
+    width: 100%;
+    overflow: auto;
   }
 
-  .controls {
-    white-space: nowrap;
+  .commit-title {
+    margin: 0;
   }
 
   .table.ci-table {
-    width: 100%;
-    table-layout: fixed;
 
     .label {
       margin-bottom: 3px;
@@ -36,21 +32,9 @@
       color: $black;
     }
 
-    .pipeline-date,
-    .pipeline-status {
-      width: 10%;
-    }
-
-    .pipeline-info,
-    .pipeline-commit,
-    .pipeline-stages {
+    .stage-cell {
       width: 20%;
     }
-
-    .pipeline-actions {
-      width: 20%;
-      padding-right: 0;
-    }
   }
 }
 
@@ -64,21 +48,7 @@
   }
 }
 
-.content-list.pipelines .table-holder {
-  min-height: 300px;
-}
-
-.pipeline-holder {
-  width: 100%;
-  overflow: auto;
-}
-
 .table.ci-table {
-  min-width: 900px;
-
-  &.pipeline {
-    min-width: 650px;
-  }
 
   &.builds-page {