diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-04 13:59:57 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-10 10:48:50 -0500 |
| commit | c2deaa7e0db808abad86e87bac9524784b02e602 (patch) | |
| tree | 7ea557b61da2e8343e5a95429751e65554b1bea4 | |
| parent | 5defad2d21b6481c07fb4a77f0a56ed7c19ff899 (diff) | |
| download | gitlab-ce-c2deaa7e0db808abad86e87bac9524784b02e602.tar.gz | |
Move hidden class to graph itself; remove background color from play node & align icon
| -rw-r--r-- | app/assets/javascripts/pipeline.js.es6 | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 5 | ||||
| -rw-r--r-- | app/views/projects/commit/_pipeline.html.haml | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/javascripts/pipeline.js.es6 b/app/assets/javascripts/pipeline.js.es6 index 6299ba2269d..68a34dda2af 100644 --- a/app/assets/javascripts/pipeline.js.es6 +++ b/app/assets/javascripts/pipeline.js.es6 @@ -31,7 +31,7 @@ if ($('.build', $this).length === 1) $this.addClass('no-margin'); }); } - $('.pipeline-graph-container').removeClass('hidden'); + $('.pipeline-graph').removeClass('hidden'); } } diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index f4211ea3b2d..4e53c9765df 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -359,11 +359,10 @@ } &.playable { - background-color: $gray-light; svg { - height: 12px; - width: 12px; + height: 13px; + width: 20px; position: relative; top: 1px; diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml index bdf3c0a2aba..288c06d9b67 100644 --- a/app/views/projects/commit/_pipeline.html.haml +++ b/app/views/projects/commit/_pipeline.html.haml @@ -1,4 +1,4 @@ -.pipeline-graph-container.hidden +.pipeline-graph-container .row-content-block.build-content.middle-block.pipeline-actions .pull-right .btn.btn-grouped.btn-white.toggle-pipeline-btn @@ -28,7 +28,7 @@ in = time_interval_in_words pipeline.duration - .row-content-block.build-content.middle-block.pipeline-graph + .row-content-block.build-content.middle-block.pipeline-graph.hidden .pipeline-visualization %ul.stage-column-list - stages = pipeline.stages_with_latest_statuses |