diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-07-17 15:01:50 +0000 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2018-07-17 19:22:21 -0300 |
| commit | c9f7cde7cb10c5170e44a3d3f5addf70f80b2f76 (patch) | |
| tree | 3ba56a815b5c071dce4470a7917a0e97a0ba7d94 | |
| parent | 230d13528ef6a48b8dac28cf63888aa9c042dc5d (diff) | |
| download | gitlab-ce-c9f7cde7cb10c5170e44a3d3f5addf70f80b2f76.tar.gz | |
Merge branch '49165-pipeline-graph-in-new-merge-request-widget-is-flickering' into 'master'
Resolve "Pipeline graph in new merge request widget is flickering"
Closes #49165
See merge request gitlab-org/gitlab-ce!20660
| -rw-r--r-- | app/assets/javascripts/pipelines/components/stage.vue | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipelines/components/stage.vue b/app/assets/javascripts/pipelines/components/stage.vue index 56fdb858088..c7df69c69ed 100644 --- a/app/assets/javascripts/pipelines/components/stage.vue +++ b/app/assets/javascripts/pipelines/components/stage.vue @@ -175,6 +175,7 @@ export default { <span :aria-label="stage.title" aria-hidden="true" + class="no-pointer-events" > <icon :name="borderlessIcon" /> </span> diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index ded33e8b151..806612ba87a 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -128,7 +128,8 @@ table { border-spacing: 0; } -.tooltip { +.tooltip, +.no-pointer-events { // Fix bootstrap4 bug whereby tooltips flicker when they are hovered over their borders pointer-events: none; } |