diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-29 08:30:42 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-29 08:30:42 +0000 |
| commit | 5f60b9b6986955790252d7306f24a7bd956a98cc (patch) | |
| tree | c4f62ea163b1c5d72ede206ba4bf43c017643b1c /app/assets/javascripts/monitoring | |
| parent | c00a5e8615fc875fd47f671dfe47a8b34eab6622 (diff) | |
| parent | 77c8e2b4f05fdbcab908eb68c1014b27665258c0 (diff) | |
| download | gitlab-ce-5f60b9b6986955790252d7306f24a7bd956a98cc.tar.gz | |
Merge branch '37102-fix-prometheus-graph-cursor-flag' into 'master'
Ensure Prometheus graph overlay is in front of cursor flag
Closes #37102
See merge request !13867
Diffstat (limited to 'app/assets/javascripts/monitoring')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/monitoring_column.vue | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/javascripts/monitoring/components/monitoring_column.vue b/app/assets/javascripts/monitoring/components/monitoring_column.vue index c0abb436e43..a31c26fb4fc 100644 --- a/app/assets/javascripts/monitoring/components/monitoring_column.vue +++ b/app/assets/javascripts/monitoring/components/monitoring_column.vue @@ -268,14 +268,6 @@ stroke-width="2" transform="translate(-5, 20)"> </path> - <rect - class="prometheus-graph-overlay" - :width="(graphWidth - 70)" - :height="(graphHeight - 100)" - transform="translate(-5, 20)" - ref="graphOverlay" - @mousemove="handleMouseOverGraph($event)"> - </rect> <monitoring-deployment :show-deploy-info="showDeployInfo" :deployment-data="reducedDeploymentData" @@ -291,6 +283,14 @@ :graph-height="graphHeight" :graph-height-offset="graphHeightOffset" /> + <rect + class="prometheus-graph-overlay" + :width="(graphWidth - 70)" + :height="(graphHeight - 100)" + transform="translate(-5, 20)" + ref="graphOverlay" + @mousemove="handleMouseOverGraph($event)"> + </rect> </svg> </svg> </div> |