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

Merge branch '37590-pipelines-mr' into 'master'
cffb325e · Annabel Dunstone Gray · fc8cd631 · 05ed804e · cffb325e · cffb325e
Commit cffb325e authored Sep 18, 2017 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

pipelines.scss app/assets/stylesheets/pages/pipelines.scss +5 -0

37590-pipelines-mr.yml changelogs/unreleased/37590-pipelines-mr.yml +5 -0

No files found.
--- 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;

--- a/changelogs/unreleased/37590-pipelines-mr.yml
+++ b/changelogs/unreleased/37590-pipelines-mr.yml
+---
+title: Fix mini graph pipeline breakin in merge request view
+merge_request:
+author:
+type: fixed