Skip to content

G
gitlab-ce
Commit aa725dc6 authored by Natalia Tepluhina's avatar Natalia Tepluhina
Browse files
Options

Merge branch '239861-scope-graph-pipeline-show-page-css' into 'master' 

Scope css pipeline graph rules to the pipelines show page

See merge request gitlab-org/gitlab!43651
parents d532a70e edb0429d
Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 209 deletions
app/assets/stylesheets/pages/pipelines.scss
View file @ aa725dc6
......@@ -386,271 +386,272 @@
}
}
}
}
.pipeline-tab-content {
display: flex;
width: 100%;
min-height: $dropdown-max-height-lg;
background-color: $gray-light;
padding: $gl-padding 0;
overflow: auto;
}
// Pipeline graph
.pipeline-graph {
white-space: nowrap;
transition: max-height 0.3s, padding 0.3s;
.stage-column-list,
.builds-container > ul {
padding: 0;
}
a {
text-decoration: none;
color: $gl-text-color;
}
svg {
vertical-align: middle;
.pipeline-tab-content {
display: flex;
width: 100%;
min-height: $dropdown-max-height-lg;
background-color: $gray-light;
padding: $gl-padding 0;
overflow: auto;
}
.stage-column {
display: inline-block;
vertical-align: top;
&.left-margin {
&:not(:first-child) {
margin-left: 44px;
// Pipeline graph, used at
// app/assets/javascripts/pipelines/components/graph/graph_component.vue
.pipeline-graph {
white-space: nowrap;
transition: max-height 0.3s, padding 0.3s;
.left-connector {
@include flat-connector-before;
}
}
.stage-column-list,
.builds-container > ul {
padding: 0;
}
&.no-margin {
margin: 0;
a {
text-decoration: none;
color: $gl-text-color;
}
li {
list-style: none;
svg {
vertical-align: middle;
}
// 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 {
border: 0;
}
// Remove right curved connectors from all builds in last stage
&:not(:first-child)::after {
border: 0;
}
// Remove opposite curve
.curve::before {
display: none;
}
}
}
.stage-column {
display: inline-block;
vertical-align: top;
// 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 {
border: 0;
}
// Remove opposite curve
.curve::after {
display: none;
&.left-margin {
&:not(:first-child) {
margin-left: 44px;
.left-connector {
@include flat-connector-before;
}
}
}
}
// Curve first child connecting lines in opposite direction
.curve {
display: none;
&::before,
&::after {
content: '';
width: 21px;
height: 25px;
position: absolute;
top: -31px;
border-top: 2px solid $border-color;
&.no-margin {
margin: 0;
}
&::after {
left: -44px;
border-right: 2px solid $border-color;
border-radius: 0 20px;
li {
list-style: none;
}
&::before {
right: -44px;
border-left: 2px solid $border-color;
border-radius: 20px 0 0;
// 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 {
border: 0;
}
// Remove right curved connectors from all builds in last stage
&:not(:first-child)::after {
border: 0;
}
// Remove opposite curve
.curve::before {
display: none;
}
}
}
}
}
.stage-name {
margin: 0 0 15px 10px;
font-weight: $gl-font-weight-bold;
width: 176px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
line-height: 2.2em;
}
.build {
position: relative;
width: 186px;
margin-bottom: 10px;
white-space: normal;
.ci-job-dropdown-container {
// override dropdown.scss
.dropdown-menu li button {
padding: 0;
text-align: center;
// 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 {
border: 0;
}
// Remove opposite curve
.curve::after {
display: none;
}
}
}
}
// ensure .build-content has hover style when action-icon is hovered
.ci-job-dropdown-container:hover .build-content {
@extend .build-content:hover;
}
// Curve first child connecting lines in opposite direction
.curve {
display: none;
.ci-status-icon svg {
height: 24px;
width: 24px;
}
&::before,
&::after {
content: '';
width: 21px;
height: 25px;
position: absolute;
top: -31px;
border-top: 2px solid $border-color;
}
.dropdown-menu-toggle {
background-color: transparent;
border: 0;
padding: 0;
&::after {
left: -44px;
border-right: 2px solid $border-color;
border-radius: 0 20px;
}
&:focus {
outline: none;
&::before {
right: -44px;
border-left: 2px solid $border-color;
border-radius: 20px 0 0;
}
}
}
.build-content {
@include build-content();
.stage-name {
margin: 0 0 15px 10px;
font-weight: $gl-font-weight-bold;
width: 176px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
line-height: 2.2em;
}
a.build-content:hover,
button.build-content:hover {
background-color: $gray-darker;
border: 1px solid $dropdown-toggle-active-border-color;
}
.build {
position: relative;
width: 186px;
margin-bottom: 10px;
white-space: normal;
// Connect first build in each stage with right horizontal line
&:first-child {
&::after {
content: '';
position: absolute;
top: 48%;
right: -48px;
border-top: 2px solid $border-color;
width: 48px;
height: 1px;
.ci-job-dropdown-container {
// override dropdown.scss
.dropdown-menu li button {
padding: 0;
text-align: center;
}
}
}
// Connect each build (except for first) with curved lines
&:not(:first-child) {
&::after,
&::before {
content: '';
top: -49px;
position: absolute;
border-bottom: 2px solid $border-color;
width: 25px;
height: 69px;
// ensure .build-content has hover style when action-icon is hovered
.ci-job-dropdown-container:hover .build-content {
@extend .build-content:hover;
}
// Right connecting curves
&::after {
right: -25px;
border-right: 2px solid $border-color;
border-radius: 0 0 20px;
.ci-status-icon svg {
height: 24px;
width: 24px;
}
// Left connecting curves
&::before {
left: -25px;
border-left: 2px solid $border-color;
border-radius: 0 0 0 20px;
.dropdown-menu-toggle {
background-color: transparent;
border: 0;
padding: 0;
&:focus {
outline: none;
}
}
}
// Connect second build to first build with smaller curved line
&:nth-child(2) {
&::after,
&::before {
height: 29px;
top: -9px;
.build-content {
@include build-content();
}
.curve {
display: block;
a.build-content:hover,
button.build-content:hover {
background-color: $gray-darker;
border: 1px solid $dropdown-toggle-active-border-color;
}
}
}
.ci-action-icon-container {
position: absolute;
right: 5px;
top: 50%;
transform: translateY(-50%);
// Connect first build in each stage with right horizontal line
&:first-child {
&::after {
content: '';
position: absolute;
top: 48%;
right: -48px;
border-top: 2px solid $border-color;
width: 48px;
height: 1px;
}
}
// Action Icons in big pipeline-graph nodes
&.ci-action-icon-wrapper {
height: 30px;
width: 30px;
border-radius: 100%;
display: block;
padding: 0;
line-height: 0;
// Connect each build (except for first) with curved lines
&:not(:first-child) {
&::after,
&::before {
content: '';
top: -49px;
position: absolute;
border-bottom: 2px solid $border-color;
width: 25px;
height: 69px;
}
svg {
fill: $gl-text-color-secondary;
// Right connecting curves
&::after {
right: -25px;
border-right: 2px solid $border-color;
border-radius: 0 0 20px;
}
// Left connecting curves
&::before {
left: -25px;
border-left: 2px solid $border-color;
border-radius: 0 0 0 20px;
}
}
.spinner {
top: 2px;
// Connect second build to first build with smaller curved line
&:nth-child(2) {
&::after,
&::before {
height: 29px;
top: -9px;
}
.curve {
display: block;
}
}
}
.ci-action-icon-container {
position: absolute;
right: 5px;
top: 50%;
transform: translateY(-50%);
// Action Icons in big pipeline-graph nodes
&.ci-action-icon-wrapper {
height: 30px;
width: 30px;
border-radius: 100%;
display: block;
padding: 0;
line-height: 0;
&.play {
svg {
left: 1px;
top: 1px;
fill: $gl-text-color-secondary;
}
.spinner {
top: 2px;
}
&.play {
svg {
left: 1px;
top: 1px;
}
}
}
}
}
.stage-action svg {
left: 1px;
top: -2px;
.stage-action svg {
left: 1px;
top: -2px;
}
}
}
// Triggers the dropdown in the big pipeline graph
.dropdown-counter-badge {
font-weight: 100;
font-size: 15px;
position: absolute;
right: 13px;
top: 8px;
// Triggers the dropdown in the big pipeline graph
.dropdown-counter-badge {
font-weight: 100;
font-size: 15px;
position: absolute;
right: 13px;
top: 8px;
}
}
.ci-build-text,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7