Merge branch '41224-pipeline-icons' into 'master'

Resolve "Cancel icons in pipeline dropdowns are misaligned"

Closes #41224 and #37318

See merge request gitlab-org/gitlab-ce!18089
This commit is contained in:
Tim Zallmann 2018-04-04 08:10:55 +00:00
commit 611abb3e9a
2 changed files with 8 additions and 5 deletions

View file

@ -706,8 +706,8 @@ button.mini-pipeline-graph-dropdown-toggle {
// dropdown content for big and mini pipeline
.big-pipeline-graph-dropdown-menu,
.mini-pipeline-graph-dropdown-menu {
width: 195px;
max-width: 195px;
width: 240px;
max-width: 240px;
.scrollable-menu {
padding: 0;
@ -750,7 +750,7 @@ button.mini-pipeline-graph-dropdown-toggle {
height: #{$ci-action-icon-size - 6};
left: -3px;
position: relative;
top: -2px;
top: -1px;
&.icon-action-stop,
&.icon-action-cancel {
@ -931,13 +931,11 @@ button.mini-pipeline-graph-dropdown-toggle {
*/
&.dropdown-menu {
transform: translate(-80%, 0);
min-width: 150px;
@media(min-width: $screen-md-min) {
transform: translate(-50%, 0);
right: auto;
left: 50%;
min-width: 240px;
}
}
}

View file

@ -0,0 +1,5 @@
---
title: Increase dropdown width in pipeline graph & center action icon
merge_request: 18089
author:
type: fixed