diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-04-04 08:10:55 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-04-04 08:10:55 +0000 |
| commit | 611abb3e9a54ae5b3580822b7c7344655aa38d06 (patch) | |
| tree | efa8e001ab706c31ac83a6adb99afc21552a26cd | |
| parent | b61e00eaf7a4f9316fac4c77347e7865aeffea29 (diff) | |
| parent | 72de3211c4ad2cc4ebf0f89ef996e30d441a5a1a (diff) | |
| download | gitlab-ce-611abb3e9a54ae5b3580822b7c7344655aa38d06.tar.gz | |
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
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/41224-pipeline-icons.yml | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 42772f13155..ce2f1482456 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -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; } } } diff --git a/changelogs/unreleased/41224-pipeline-icons.yml b/changelogs/unreleased/41224-pipeline-icons.yml new file mode 100644 index 00000000000..3fe05448d1c --- /dev/null +++ b/changelogs/unreleased/41224-pipeline-icons.yml @@ -0,0 +1,5 @@ +--- +title: Increase dropdown width in pipeline graph & center action icon +merge_request: 18089 +author: +type: fixed |