diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-20 10:59:15 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-20 10:59:15 +0000 |
| commit | 21efc1a2b47e1432ba89aa4996b1b5d1df825aa1 (patch) | |
| tree | 7426d93a891a9052a5cff177c8ac956cc2eadd08 | |
| parent | d8e27949b81de74382f1f0143e5e46c2c22dd6ee (diff) | |
| parent | 02d0b50b167c7bc293601c14e10f1f521373dfec (diff) | |
| download | gitlab-ce-21efc1a2b47e1432ba89aa4996b1b5d1df825aa1.tar.gz | |
Merge branch '10517-pipelines-css' into 'master'
Removes EE differences for pipelines.scss
Closes gitlab-ee#10517
See merge request gitlab-org/gitlab-ce!26350
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 2b6319ddd4f..ef9c87d0452 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -498,7 +498,8 @@ list-style: none; } - &:last-child { + // when downstream pipelines are present, the last stage isn't the last column + &:last-child:not(.has-downstream) { .build { // Remove right connecting horizontal line from first build in last stage &:first-child::after { @@ -515,7 +516,8 @@ } } - &:first-child { + // when upstream pipelines are present, the first stage isn't the first column + &:first-child:not(.has-upstream) { .build { // Remove left curved connectors from all builds in first stage &:not(:first-child)::before { |