diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-09 15:39:01 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-16 15:34:28 -0500 |
| commit | e573cdfb91308759923fbd0aacb12f801dfb561f (patch) | |
| tree | 412c7a0d94868281cb7d6c9b9dbaa186804d1f9f | |
| parent | d7b3b15f60e25e1b11b6fcc22f96c63bffa137a8 (diff) | |
| download | gitlab-ce-e573cdfb91308759923fbd0aacb12f801dfb561f.tar.gz | |
Fix graph scrolling bug
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 13 | ||||
| -rw-r--r-- | app/views/projects/commit/_pipeline.html.haml | 5 |
2 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 49225d7d0d4..01bd131940a 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -232,20 +232,21 @@ // Pipeline visualization -.pipeline-visualization { - position: relative; +.pipeline-graph { width: 100%; overflow: auto; + white-space: nowrap; +} + +.pipeline-visualization { + position: relative; + min-width: 1220px; ul { padding: 0; } } -.stage-column-list { - min-width: 1220px; -} - .stage-column { display: inline-block; vertical-align: top; diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml index 4dacff8f6eb..e2187673da7 100644 --- a/app/views/projects/commit/_pipeline.html.haml +++ b/app/views/projects/commit/_pipeline.html.haml @@ -1,5 +1,4 @@ -.row-content-block.white - +.row-content-block.build-content.middle-block.pipeline-graph .pipeline-visualization %ul.stage-column-list - pipeline.statuses.stages.each do |stage| @@ -19,7 +18,7 @@ = ci_icon_for_status(status) = build.name -.row-content-block.build-content.middle-block +.row-content-block.build-content.middle-block.pipeline-graph .pull-right - if can?(current_user, :update_pipeline, pipeline.project) - if pipeline.builds.latest.failed.any?(&:retryable?) |