Commit cb868f41 authored by Annabel Gray's avatar Annabel Gray

Merge branch 'leipert-move-ee-specific-pipeline-scss-backport' into 'master'

Backport changes of gitlab-ee!5852

See merge request gitlab-org/gitlab-ce!19145
parents 50c8ed2b 6fb35c84
@mixin flat-connector-before($length: 44px) {
&::before {
content: '';
position: absolute;
top: 48%;
left: -$length;
border-top: 2px solid $border-color;
width: $length;
height: 1px;
}
}
@mixin build-content($border-radius: 30px) {
display: inline-block;
padding: 8px 10px 9px;
width: 100%;
border: 1px solid $border-color;
border-radius: $border-radius;
background-color: $white-light;
&:hover {
background-color: $stage-hover-bg;
border: 1px solid $dropdown-toggle-active-border-color;
color: $gl-text-color;
}
}
.pipelines { .pipelines {
.stage { .stage {
max-width: 90px; max-width: 90px;
...@@ -357,14 +384,8 @@ ...@@ -357,14 +384,8 @@
&:not(:first-child) { &:not(:first-child) {
margin-left: 44px; margin-left: 44px;
.left-connector::before { .left-connector {
content: ''; @include flat-connector-before;
position: absolute;
top: 48%;
left: -44px;
border-top: 2px solid $border-color;
width: 44px;
height: 1px;
} }
} }
} }
...@@ -479,12 +500,7 @@ ...@@ -479,12 +500,7 @@
} }
.build-content { .build-content {
display: inline-block; @include build-content();
padding: 8px 10px 9px;
width: 100%;
border: 1px solid $border-color;
border-radius: 30px;
background-color: $white-light;
} }
a.build-content:hover, a.build-content:hover,
...@@ -622,8 +638,7 @@ ...@@ -622,8 +638,7 @@
} }
} }
// Dropdown button in mini pipeline graph @mixin mini-pipeline-item() {
button.mini-pipeline-graph-dropdown-toggle {
border-radius: 100px; border-radius: 100px;
background-color: $white-light; background-color: $white-light;
border-width: 1px; border-width: 1px;
...@@ -636,30 +651,6 @@ button.mini-pipeline-graph-dropdown-toggle { ...@@ -636,30 +651,6 @@ button.mini-pipeline-graph-dropdown-toggle {
position: relative; position: relative;
vertical-align: middle; vertical-align: middle;
> .fa.fa-caret-down {
position: absolute;
left: 20px;
top: 5px;
display: inline-block;
visibility: hidden;
opacity: 0;
color: inherit;
font-size: 12px;
transition: visibility 0.1s, opacity 0.1s linear;
}
&:active,
&:focus,
&:hover {
outline: none;
width: 35px;
.fa.fa-caret-down {
visibility: visible;
opacity: 1;
}
}
// Dropdown button animation in mini pipeline graph // Dropdown button animation in mini pipeline graph
&.ci-status-icon-success { &.ci-status-icon-success {
@include mini-pipeline-graph-color($green-100, $green-500, $green-600); @include mini-pipeline-graph-color($green-100, $green-500, $green-600);
...@@ -691,6 +682,35 @@ button.mini-pipeline-graph-dropdown-toggle { ...@@ -691,6 +682,35 @@ button.mini-pipeline-graph-dropdown-toggle {
} }
} }
// Dropdown button in mini pipeline graph
button.mini-pipeline-graph-dropdown-toggle {
@include mini-pipeline-item();
> .fa.fa-caret-down {
position: absolute;
left: 20px;
top: 5px;
display: inline-block;
visibility: hidden;
opacity: 0;
color: inherit;
font-size: 12px;
transition: visibility 0.1s, opacity 0.1s linear;
}
&:active,
&:focus,
&:hover {
outline: none;
width: 35px;
.fa.fa-caret-down {
visibility: visible;
opacity: 1;
}
}
}
/** /**
Action icons inside dropdowns: Action icons inside dropdowns:
- mini graph in pipelines table - mini graph in pipelines table
...@@ -744,7 +764,7 @@ button.mini-pipeline-graph-dropdown-toggle { ...@@ -744,7 +764,7 @@ button.mini-pipeline-graph-dropdown-toggle {
} }
} }
// SVGs in the commit widget and mr widget // SVGs in the commit widget and mr widget
a.ci-action-icon-container.ci-action-icon-wrapper svg { a.ci-action-icon-container.ci-action-icon-wrapper svg {
top: 2px; top: 2px;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment