summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-18 15:35:16 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-18 15:35:16 +0000
commitcffb325ec05eefb29f8ee93e543fd75605743f55 (patch)
tree591258b8ae231ac1c9a37bcab95d5f4e24d59338
parentfc8cd631928fb81c736d724d4051dcdd0ffd6a66 (diff)
parent05ed804e01b560a1a95f762d74ae8d09576407df (diff)
downloadgitlab-ce-cffb325ec05eefb29f8ee93e543fd75605743f55.tar.gz
Merge branch '37590-pipelines-mr' into 'master'
Fix mini graph pipeline breaking in merge request view Closes #37590 See merge request gitlab-org/gitlab-ce!14306
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss5
-rw-r--r--changelogs/unreleased/37590-pipelines-mr.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 296b6310552..9d03a042aa3 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -209,6 +209,11 @@
}
.stage-cell {
+ @media (min-width: $screen-md-min) {
+ min-width: 148px;
+ margin-right: -4px;
+ }
+
.mini-pipeline-graph-dropdown-toggle svg {
height: $ci-action-icon-size;
width: $ci-action-icon-size;
diff --git a/changelogs/unreleased/37590-pipelines-mr.yml b/changelogs/unreleased/37590-pipelines-mr.yml
new file mode 100644
index 00000000000..ee609888155
--- /dev/null
+++ b/changelogs/unreleased/37590-pipelines-mr.yml
@@ -0,0 +1,5 @@
+---
+title: Fix mini graph pipeline breakin in merge request view
+merge_request:
+author:
+type: fixed