diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-19 12:00:27 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-19 12:00:27 +0100 |
commit | 2c835eec69f37699dcee28f6b044a0b2797c0d0c (patch) | |
tree | 6aa58fb26409c00b1eff7ceec4a67d7dab3898b8 /app/assets/stylesheets/pages/pipelines.scss | |
parent | fd972f9fd7260158e6707c1825547bbce1cfdc04 (diff) | |
download | gitlab-ce-2c835eec69f37699dcee28f6b044a0b2797c0d0c.tar.gz |
Renders json endpoint + updates CSS to render the same between pipelines table and pipeline graph
Diffstat (limited to 'app/assets/stylesheets/pages/pipelines.scss')
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 137 |
1 files changed, 93 insertions, 44 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 3a8ec779c14..f8587d47a3c 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -462,61 +462,61 @@ text-overflow: ellipsis; } - .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; - } - } - - // ensure .build-content has hover style when action-icon is hovered - .ci-job-dropdown-container:hover .build-content { - @extend .build-content:hover; + .ci-job-dropdown-container { + // override dropdown.scss + .dropdown-menu li button { + padding: 0; + text-align: center; } + } - .ci-action-icon-container { - position: absolute; - right: 5px; - top: 5px; - - // Action Icons in big pipeline-graph nodes - &.ci-action-icon-wrapper { - height: 30px; - width: 30px; - background: $white-light; - border: 1px solid $border-color; - border-radius: 100%; - display: block; + .ci-action-icon-container { + position: absolute; + right: 5px; + top: 5px; - &:hover { - background-color: $stage-hover-bg; - border: 1px solid $dropdown-toggle-active-border-color; + // Action Icons in big pipeline-graph nodes + &.ci-action-icon-wrapper { + height: 30px; + width: 30px; + background: $white-light; + border: 1px solid $border-color; + border-radius: 100%; + display: block; - svg { - fill: $gl-text-color; - } - } + &:hover { + background-color: $stage-hover-bg; + border: 1px solid $dropdown-toggle-active-border-color; svg { - fill: $gl-text-color-secondary; - position: relative; - top: -1px; + fill: $gl-text-color; } + } - &.play { - svg { - left: 2px; - } + svg { + fill: $gl-text-color-secondary; + position: relative; + top: -1px; + } + + &.play { + svg { + left: 2px; } } } + } + + .build { + position: relative; + width: 186px; + margin-bottom: 10px; + white-space: normal; + + // ensure .build-content has hover style when action-icon is hovered + .ci-job-dropdown-container:hover .build-content { + @extend .build-content:hover; + } .ci-status-icon svg { height: 20px; @@ -604,6 +604,55 @@ } } + +/** + Icons inside dropdown +*/ +.big-pipeline-graph-dropdown-menu, +.mini-pipeline-graph-dropdown-menu { + + // override dropdown.scss + &.dropdown-menu li button { + padding: 0; + text-align: center; + } + + .ci-action-icon-container { + position: absolute; + right: 5px; + top: 5px; + + // Action Icons in big pipeline-graph nodes + &.ci-action-icon-wrapper { + height: $ci-action-dropdown-button-size; + width: $ci-action-dropdown-button-size; + + background: $white-light; + border: 1px solid $border-color; + border-radius: 50%; + display: block; + + &:hover { + background-color: $stage-hover-bg; + border: 1px solid $dropdown-toggle-active-border-color; + + svg { + fill: $gl-text-color; + } + } + + svg { + width: $ci-action-dropdown-svg-size; + height: $ci-action-dropdown-svg-size; + fill: $gl-text-color-secondary; + position: relative; + top: 0px; + vertical-align: initial; + } + } + } +} + // Triggers the dropdown in the big pipeline graph .dropdown-counter-badge { font-weight: 100; |