diff options
author | Simon Knox <psimyn@gmail.com> | 2018-06-26 17:39:15 +1000 |
---|---|---|
committer | Simon Knox <psimyn@gmail.com> | 2018-06-26 17:39:15 +1000 |
commit | 111f53c8b3f4739cc2f068abf182725b869a8ec1 (patch) | |
tree | 82997970ee82c918a5bddf3a35312ec250b23ef9 | |
parent | 9490c378338bd415ad0a53897a85b6acda4ec676 (diff) | |
download | gitlab-ce-47516-pipe-scroll.tar.gz |
fix overflowing tooltips in pipelines dropdown47516-pipe-scroll
-rw-r--r-- | app/assets/javascripts/pipelines/components/graph/job_component.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/pipelines/components/stage.vue | 36 |
2 files changed, 16 insertions, 22 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/job_component.vue b/app/assets/javascripts/pipelines/components/graph/job_component.vue index 886e62ab1a7..309fe7c6a98 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_component.vue @@ -96,7 +96,7 @@ export default { :class="cssClassJobName" data-container="body" data-html="true" - data-boundary="viewport" + data-boundary="scrollParent" class="js-pipeline-graph-job-link" > diff --git a/app/assets/javascripts/pipelines/components/stage.vue b/app/assets/javascripts/pipelines/components/stage.vue index b9231c002fd..d1b1f586dff 100644 --- a/app/assets/javascripts/pipelines/components/stage.vue +++ b/app/assets/javascripts/pipelines/components/stage.vue @@ -186,32 +186,26 @@ export default { </i> </button> - <ul + <div class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container" aria-labelledby="stageDropdown" > - - <li + <loading-icon v-if="isLoading"/> + <ul + v-else class="js-builds-dropdown-list scrollable-menu" > - - <loading-icon v-if="isLoading"/> - - <ul - v-else + <li + v-for="job in dropdownContent" + :key="job.id" > - <li - v-for="job in dropdownContent" - :key="job.id" - > - <job-component - :job="job" - css-class-job-name="mini-pipeline-graph-dropdown-item" - @pipelineActionRequestComplete="pipelineActionRequestComplete" - /> - </li> - </ul> - </li> - </ul> + <job-component + :job="job" + css-class-job-name="mini-pipeline-graph-dropdown-item" + @pipelineActionRequestComplete="pipelineActionRequestComplete" + /> + </li> + </ul> + </div> </div> </template> |