From cc7e2a7060001497322d499fa0d96db33f7c9927 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Mon, 18 Sep 2017 15:35:16 +0000 Subject: 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 --- app/assets/stylesheets/pages/pipelines.scss | 5 +++++ changelogs/unreleased/37590-pipelines-mr.yml | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 changelogs/unreleased/37590-pipelines-mr.yml 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 -- cgit v1.2.1