Merge branch 'minor-pipeline-graph-beautyfixes' into 'master'

big and mini pipeline css changes

See merge request !8224

2 files changed, 46 insertions, 26 deletions

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 566de8a4eba..f6164c8907e 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -80,6 +80,10 @@
     td {
       padding: 10px 8px;
     }
+
+    .commit-link {
+      padding: 9px 8px 10px;
+    }
   }
 
   tbody {
@@ -193,7 +197,7 @@
           width: 8px;
           position: absolute;
           right: -7px;
-          bottom: 9px;
+          bottom: 10px;
           border-bottom: 2px solid $border-color;
         }
       }
@@ -499,15 +503,10 @@
 
     > .ci-action-icon-container {
       position: absolute;
-      right: 4px;
+      right: 5px;
       top: 5px;
     }
 
-    .ci-status-icon {
-      position: relative;
-      top: 1px;
-    }
-
     .ci-status-icon svg {
       height: 20px;
       width: 20px;
@@ -614,6 +613,10 @@
 
   a {
     display: inline-block;
+  }
+
+  .build-content {
+    width: 138px;
 
     &:hover {
       background-color: $stage-hover-bg;
@@ -623,15 +626,24 @@
   ul {
     max-height: 245px;
     overflow: auto;
-    margin: 5px 0;
+    margin: 3px 0;
 
     li {
       padding-top: 2px;
-      margin: 0 5px;
+      margin: 4px 7px;
+      padding: 0 3px;
       padding-left: 0;
       padding-bottom: 0;
-      margin-bottom: 0;
-      line-height: 1.2;
+      line-height: 0;
+
+      .ci-action-icon-container:hover {
+        background-color: transparent;
+      }
+
+      .ci-status-icon {
+        position: relative;
+        top: 2px;
+      }
     }
   }
 }
@@ -680,11 +692,15 @@
 .dropdown-build {
   color: $gl-text-color-light;
 
+  .build-content {
+    padding: 3px 7px 6px;
+  }
+
   .ci-action-icon-container {
     padding: 0;
     font-size: 11px;
     float: right;
-    margin-top: 4px;
+    margin-top: 3px;
     display: inline-block;
     position: relative;
 
@@ -694,16 +710,10 @@
     }
   }
 
-  &:hover {
-    background-color: $stage-hover-bg;
-    border-radius: 3px;
-    color: $gl-text-color;
-  }
-
   .ci-action-icon-container {
     i {
-      width: 25px;
-      height: 25px;
+      width: 24px;
+      height: 24px;
 
       &::before {
         top: 1px;
@@ -740,6 +750,10 @@
     margin: 0;
   }
 
+  .dropdown-build .build-content {
+    padding: 3px 7px 7px;
+  }
+
   .builds-dropdown-loading {
     margin: 10px auto;
     width: 18px;
@@ -788,19 +802,25 @@
 .mini-pipeline-graph-icon-container .ci-status-icon {
   display: inline-block;
   border: 1px solid;
-  border-radius: 20px;
+  border-radius: 22px;
   margin-right: 1px;
-  width: 20px;
-  height: 20px;
+  width: 22px;
+  height: 22px;
   position: relative;
   z-index: 2;
   transition: all 0.2s cubic-bezier(0.25, 0, 1, 1);
 
   svg {
     top: -1px;
+    left: -1px;
   }
 }
 
+.stage-cell .mini-pipeline-graph-icon-container .ci-status-icon svg {
+  width: 22px;
+  height: 22px;
+}
+
 .builds-dropdown {
   &:focus {
     outline: none;
@@ -851,7 +871,7 @@
   .mini-pipeline-graph-icon-container {
     .ci-status-icon:hover,
     .ci-status-icon:focus {
-      width: 28px;
+      width: 32px;
       padding: 0 8px 0 0;
 
       + .dropdown-caret {
@@ -863,7 +883,7 @@
       font-size: 11px;
       position: relative;
       top: 3px;
-      left: -11px;
+      left: -14px;
       margin-right: -6px;
       display: none;
       z-index: 2;
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index a810ed32327..4acd17360c1 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -1,6 +1,6 @@
 .container-fluid {
   .ci-status {
-    padding: 2px 7px;
+    padding: 2px 7px 4px;
     margin-right: 10px;
     border: 1px solid $gray-darker;
     white-space: nowrap;