Merge branch '23167-min-row-height' into 'master'

Resolve "Build/Pipeline/Environment List Inconsistency Row Height" #### What does this MR do? * Changes generic table class from `builds` to `ci-table`. It was getting confusing using `builds` for `builds`, `pipelines`, `environments` * Sets height on builds rows for continuity #### Are there points in the code the reviewer needs to double check? Apparently you can't set `min-height` on any `table` elements but you _can_ set `height`. For some reason, even if the content within happens to start wrapping, the row height will grow instead of letting the content overlap. Which is a good thing. Just kind of weird. #### Why was this MR needed? Different row heights on builds depending on content #### Screenshots (if relevant) Before: ![Screen_Shot_2016-10-10_at_4.49.58_PM](/uploads/a4edb584f95c670f9815a8e5b1d725ee/Screen_Shot_2016-10-10_at_4.49.58_PM.png) After: ![Screen_Shot_2016-10-10_at_4.32.03_PM](/uploads/488a84b4ed292fbbb0ea7e372c017ae0/Screen_Shot_2016-10-10_at_4.32.03_PM.png) Before: ![Screen_Shot_2016-10-10_at_4.44.23_PM](/uploads/3cbcbada89d1aeb1fea35ea9b851e370/Screen_Shot_2016-10-10_at_4.44.23_PM.png) After: ![Screen_Shot_2016-10-10_at_4.42.56_PM](/uploads/0cb573670f60c7fdf54fdb027c95639f/Screen_Shot_2016-10-10_at_4.42.56_PM.png) ## What are the relevant issue numbers? Closes #23167 See merge request !6787

Merge branch '23167-min-row-height' into 'master'
ecd7e99a · Fatih Acet · 05762f44 · 64609ba8 · ecd7e99a · ecd7e99a
Commit ecd7e99a authored Oct 14, 2016 by Fatih Acet
11 changed files
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -52,13 +52,13 @@
  }
 }

-.table.builds.environments {
+.table.ci-table.environments {

  .icon-container {
    width: 20px;
    text-align: center;
  }
-  
+
  .branch-commit {
    .commit-id {
      margin-right: 0;

--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -280,12 +280,6 @@
  line-height: 31px;
 }

-.builds {
-  .table-holder {
-    overflow-x: auto;
-  }
-}
-
 .panel-new-merge-request {
  .panel-heading {
    padding: 5px 10px;
@@ -373,7 +367,7 @@
 }

 .table-holder {
-  .builds {
+  .ci-table {

    th {
      background-color: $white-light;

--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -20,7 +20,7 @@
    margin: 4px;
  }

-  .table.builds {
+  .table.ci-table {
    min-width: 1200px;

    .branch-commit {
@@ -44,13 +44,20 @@
  overflow: auto;
 }

-.table.builds {
+.table.ci-table {
  min-width: 900px;

  &.pipeline {
    min-width: 650px;
  }

+  &.builds-page {
+
+    tr {
+      height: 71px;
+    }
+  }
+
  tr {
    th {
      padding: 16px 8px;
@@ -621,19 +628,31 @@
  }
 }

-.pipelines.tab-pane {
+.tab-pane {

-  .content-list.pipelines {
-    overflow: auto;
-  }
+  &.pipelines {

-  .stage {
-    max-width: 100px;
-    width: 100px;
+    .content-list.pipelines {
+      overflow: auto;
+    }
+
+    .stage {
+      max-width: 100px;
+      width: 100px;
+    }
+
+    .pipeline-actions {
+      min-width: initial;
+    }
  }

-  .pipeline-actions {
-    min-width: initial;
+  &.builds {
+
+    .ci-table {
+      tr {
+        height: 71px;
+      }
+    }
  }
 }


--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -71,7 +71,7 @@

  .col-md-6
    %h4 Recent builds served by this Runner
-    %table.table.builds.runner-builds
+    %table.table.ci-table.runner-builds
      %thead
        %tr
          %th Build

--- a/app/views/projects/builds/_table.html.haml
+++ b/app/views/projects/builds/_table.html.haml
@@ -5,7 +5,7 @@
    .nothing-here-block No builds to show
 - else
  .table-holder
-    %table.table.builds
+    %table.table.ci-table.builds-page
      %thead
        %tr
          %th Status

--- a/app/views/projects/commit/_pipeline.html.haml
+++ b/app/views/projects/commit/_pipeline.html.haml
@@ -56,7 +56,7 @@
    \.gitlab-ci.yml not found in this commit

 .table-holder.pipeline-holder
-  %table.table.builds.pipeline
+  %table.table.ci-table.pipeline
    %thead
      %tr
        %th Status

--- a/app/views/projects/commit/_pipelines_list.haml
+++ b/app/views/projects/commit/_pipelines_list.haml
@@ -4,7 +4,7 @@
      .nothing-here-block No pipelines to show
  - else
    .table-holder
-      %table.table.builds
+      %table.table.ci-table
        %tbody
          %th Status
          %th Pipeline

--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -24,7 +24,7 @@
            New environment
    - else
      .table-holder
-        %table.table.builds.environments
+        %table.table.ci-table.environments
          %tbody
            %th Environment
            %th Last Deployment

--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -24,7 +24,7 @@
        = link_to "Read more", help_page_path("ci/environments"), class: "btn btn-success"
    - else
      .table-holder
-        %table.table.builds.environments
+        %table.table.ci-table.environments
          %thead
            %tr
              %th ID

--- a/app/views/projects/pipelines/index.html.haml
+++ b/app/views/projects/pipelines/index.html.haml
@@ -43,7 +43,7 @@
        .nothing-here-block No pipelines to show
    - else
      .table-holder
-        %table.table.builds
+        %table.table.ci-table
          %thead
            %th.col-xs-1.col-sm-1 Status
            %th.col-xs-2.col-sm-4 Pipeline

--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -45,7 +45,7 @@ feature 'Merge request created from fork' do
      page.within('.merge-request-tabs') { click_link 'Builds' }
      wait_for_ajax

-      page.within('table.builds') do
+      page.within('table.ci-table') do
        expect(page).to have_content 'rspec'
        expect(page).to have_content 'spinach'
      end