From 7676b1fc93d8457ed66962d5ac615c7235d18e86 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 23 Feb 2017 11:34:38 +0000
Subject: [PATCH] Aligns text content instead of div

---
 .../vue_pipelines_index/time_ago.js.es6       |  32 ++--
 app/assets/stylesheets/pages/pipelines.scss   | 156 ++++++++----------
 2 files changed, 82 insertions(+), 106 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 d971588af96..6048fa691dc 100644
--- a/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6
+++ b/app/assets/javascripts/vue_pipelines_index/time_ago.js.es6
@@ -54,23 +54,21 @@ require('../lib/utils/datetime_utility');
       },
     },
     template: `
-      <td>
-        <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 class="pipelines-time-ago">
+        <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>
       </td>
     `,
   });
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index b67f6b731a8..9f3b3a3a3bc 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -35,6 +35,69 @@
     .stage-cell {
       width: 20%;
     }
+
+    .pipelines-time-ago {
+      text-align: right;
+    }
+
+    .pipeline-actions {
+      padding-right: 0;
+      min-width: 170px; //Guarantees buttons don't break in several lines.
+
+      .btn-default {
+        color: $gl-text-color-secondary;
+      }
+
+      .btn.btn-retry:hover,
+      .btn.btn-retry:focus {
+        border-color: $gray-darkest;
+        background-color: $white-normal;
+      }
+
+      svg path {
+        fill: $gl-text-color-secondary;
+      }
+
+      .dropdown-menu {
+        max-height: 250px;
+        overflow-y: auto;
+      }
+
+      .dropdown-toggle,
+      .dropdown-menu {
+        color: $gl-text-color-secondary;
+
+        .fa {
+          color: $gl-text-color-secondary;
+          font-size: 14px;
+        }
+
+        svg,
+        .fa {
+          margin-right: 0;
+        }
+      }
+
+      .btn-group {
+        &.open {
+          .btn-default {
+            background-color: $white-normal;
+            border-color: $border-white-normal;
+          }
+        }
+
+        .btn {
+          .icon-play {
+            height: 13px;
+            width: 12px;
+          }
+        }
+      }
+
+      .tooltip {
+        white-space: nowrap;
+      }
+    }
   }
 }
 
@@ -50,11 +113,8 @@
 
 .table.ci-table {
 
-  &.builds-page {
-
-    tr {
-      height: 71px;
-    }
+  &.builds-page tr {
+    height: 71px;
   }
 
   tr {
@@ -179,65 +239,6 @@
     }
   }
 
-  .pipeline-actions {
-    padding-right: 0;
-    min-width: 170px; //Guarantees buttons don't break in several lines.
-
-    .btn-default {
-      color: $gl-text-color-secondary;
-    }
-
-    .btn.btn-retry:hover,
-    .btn.btn-retry:focus {
-      border-color: $gray-darkest;
-      background-color: $white-normal;
-    }
-
-    svg path {
-      fill: $gl-text-color-secondary;
-    }
-
-    .dropdown-menu {
-      max-height: 250px;
-      overflow-y: auto;
-    }
-
-    .dropdown-toggle,
-    .dropdown-menu {
-      color: $gl-text-color-secondary;
-
-      .fa {
-        color: $gl-text-color-secondary;
-        font-size: 14px;
-      }
-
-      svg,
-      .fa {
-        margin-right: 0;
-      }
-    }
-
-    .btn-group {
-      &.open {
-        .btn-default {
-          background-color: $white-normal;
-          border-color: $border-white-normal;
-        }
-      }
-
-      .btn {
-        .icon-play {
-          height: 13px;
-          width: 12px;
-        }
-      }
-    }
-
-    .tooltip {
-      white-space: nowrap;
-    }
-  }
-
   .build-link a {
     color: $gl-text-color;
   }
@@ -303,31 +304,8 @@
 }
 
 .tab-pane {
-  &.pipelines {
-    .ci-table {
-      min-width: 900px;
-    }
-
-    .content-list.pipelines {
-      overflow: auto;
-    }
-
-    .stage {
-      max-width: 100px;
-      width: 100px;
-    }
-
-    .pipeline-actions {
-      min-width: 170px;
-    }
-  }
-
-  &.builds {
-    .ci-table {
-      tr {
-        height: 71px;
-      }
-    }
+  &.builds .ci-table tr {
+    height: 71px;
   }
 }