summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormfluharty <mfluharty@gitlab.com>2019-08-05 21:45:26 -0600
committermfluharty <mfluharty@gitlab.com>2019-09-16 09:27:01 -0600
commit78cc72220dea62b1df81cbd07940db997e799efe (patch)
tree5e15cf12631cc9361849b8bd2be7e428d3827b19
parenta1664944a1be7723c7854c5638fc0553220ab2b0 (diff)
downloadgitlab-ce-78cc72220dea62b1df81cbd07940db997e799efe.tar.gz
Port back CSS changes made for EE
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss28
1 files changed, 15 insertions, 13 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 6b4ab2d5779..5cb538ec03e 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -1,8 +1,11 @@
@mixin flat-connector-before($length: 16px) {
+ overflow: visible;
+ position: relative;
+
&::before {
content: '';
position: absolute;
- top: 48%;
+ top: 24px;
left: -$length;
border-top: 1px solid $border-color;
width: $length;
@@ -13,12 +16,15 @@
@mixin build-content() {
display: inline-block;
padding: $gl-padding-12 $gl-padding;
- height: 50px;
width: 100%;
border: 1px solid $border-color;
- border-top: 0;
background-color: $white-light;
+ &:not(.linked-pipeline-content) {
+ height: 50px;
+ border-top: 0;
+ }
+
&:hover {
background-color: $gray-100;
color: $gl-text-color;
@@ -485,7 +491,6 @@
&:not(:first-child) {
.stage-name {
- overflow: visible;
@include flat-connector-before;
}
}
@@ -603,18 +608,15 @@
.spinner {
top: 2px;
}
-
- &.play {
- svg {
- left: 2px;
- }
- }
}
}
- .stage-action svg {
- left: 1px;
- top: -2px;
+ .stage-action {
+ border: 1px solid $gray-400;
+
+ svg {
+ left: 1px;
+ }
}
}