Add latest changes from gitlab-org/gitlab@master

1 files changed, 25 insertions, 2 deletions

diff --git a/app/assets/stylesheets/page_bundles/cycle_analytics.scss b/app/assets/stylesheets/page_bundles/cycle_analytics.scss
index 2248d95ae24..2742c95c6e1 100644
--- a/app/assets/stylesheets/page_bundles/cycle_analytics.scss
+++ b/app/assets/stylesheets/page_bundles/cycle_analytics.scss
@@ -30,12 +30,32 @@
 
   .col-headers {
     ul {
+      @include clearfix;
       margin: 0;
       padding: 0;
     }
 
     li {
+      display: inline-block;
+      float: left;
       line-height: 50px;
+      width: 20%;
+    }
+
+    .stage-header {
+      width: 20.5%;
+    }
+
+    .median-header {
+      width: 19.5%;
+    }
+
+    .event-header {
+      width: 45%;
+    }
+
+    .total-time-header {
+      width: 15%;
     }
   }
 
@@ -100,6 +120,7 @@
     }
 
     li {
+      @include clearfix;
       list-style-type: none;
     }
 
@@ -148,6 +169,7 @@
 
     .events-description {
       line-height: 65px;
+      padding: 0 $gl-padding;
     }
 
     .events-info {
@@ -156,6 +178,7 @@
   }
 
   .stage-events {
+    width: 60%;
     min-height: 467px;
   }
 
@@ -167,8 +190,8 @@
   .stage-event-item {
     @include clearfix;
     list-style-type: none;
-    padding-bottom: $gl-padding;
-    margin-bottom: $gl-padding;
+    padding: 0 0 $gl-padding;
+    margin: 0 $gl-padding $gl-padding;
     border-bottom: 1px solid var(--gray-50, $gray-50);
 
     &:last-child {