diff options
author | mfluharty <mfluharty@gitlab.com> | 2019-09-11 21:51:32 -0600 |
---|---|---|
committer | mfluharty <mfluharty@gitlab.com> | 2019-09-11 21:51:32 -0600 |
commit | 183c3a487515bb9cd67fa1bd2834276616ac17a4 (patch) | |
tree | dde3aa7b0990e84d51a542a42aecc187ac4c48db | |
parent | c009253459963ba94cbeed9460048d8a9b0ed8fe (diff) | |
download | gitlab-ce-183c3a487515bb9cd67fa1bd2834276616ac17a4.tar.gz |
Change container selector for padding calculation
Use js-pipeline-container for alignment to container
Remove css side padding from pipeline tab content
Accounting for right padding no longer needed
-rw-r--r-- | app/assets/javascripts/pipelines/components/graph/graph_component.vue | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue index 39a33f7fa97..911fb5cab7a 100644 --- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue @@ -42,14 +42,11 @@ export default { }, methods: { setGraphPadding() { - const container = document.querySelector('.content .container-limited'); + const container = document.querySelector('.js-pipeline-container'); if (!container) return; - const containerRightPadding = 16; - this.graphLeftPadding = container.offsetLeft; - this.graphRightPadding = - window.innerWidth - container.offsetLeft - container.offsetWidth + containerRightPadding; + this.graphRightPadding = window.innerWidth - container.offsetLeft - container.offsetWidth; }, handleLayoutChange() { // wait until animations finish, then recalculate padding diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index d4bd5b1b7dc..9709d678807 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -449,7 +449,7 @@ display: flex; width: 100%; background-color: $gray-light; - padding: $gl-padding; + padding: $gl-padding 0; overflow: auto; } |