diff options
author | pburdette <pburdette@gitlab.com> | 2019-09-04 12:48:07 -0400 |
---|---|---|
committer | pburdette <pburdette@gitlab.com> | 2019-09-04 16:10:39 -0400 |
commit | 738060efba65c4e8727e57618c1280801c2b775e (patch) | |
tree | f484621fe81d6f637e6189d8385dafebdc35650c /app/assets/javascripts/pipelines | |
parent | ec5808a645fde49059eb97f9db82e0e1fedbd1a6 (diff) | |
download | gitlab-ce-738060efba65c4e8727e57618c1280801c2b775e.tar.gz |
Adds backport change for pipeline.scssfix-style-lint-errors-pipeline-ce
Adds the necessary backport changes for pipeline.scss. This commit is
neccessary from the changes made in MR 16135
Revert schema.rb which was automatically added will investigate
Diffstat (limited to 'app/assets/javascripts/pipelines')
-rw-r--r-- | app/assets/javascripts/pipelines/components/graph/graph_component.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/pipelines/mixins/graph_component_mixin.js | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue index ba0dea626dc..27c1b639889 100644 --- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue @@ -20,6 +20,9 @@ export default { <stage-column-component v-for="(stage, index) in graph" :key="stage.name" + :class="{ + 'append-right-48': shouldAddRightMargin(index), + }" :title="capitalizeStageName(stage.name)" :groups="stage.groups" :stage-connector-class="stageConnectorClass(index, stage)" diff --git a/app/assets/javascripts/pipelines/mixins/graph_component_mixin.js b/app/assets/javascripts/pipelines/mixins/graph_component_mixin.js index 66e9476dadf..f383a4b3368 100644 --- a/app/assets/javascripts/pipelines/mixins/graph_component_mixin.js +++ b/app/assets/javascripts/pipelines/mixins/graph_component_mixin.js @@ -40,5 +40,15 @@ export default { refreshPipelineGraph() { this.$emit('refreshPipelineGraph'); }, + /** + * CSS class is applied: + * - if pipeline graph contains only one stage column component + * + * @param {number} index + * @returns {boolean} + */ + shouldAddRightMargin(index) { + return !(index === this.graph.length - 1); + }, }, }; |