diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-07-17 15:01:50 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-07-17 15:01:50 +0000 |
| commit | 6fdc6976ec1f05d961b1bb4f4904b0d936efe0a0 (patch) | |
| tree | 5fe693e4ae0ac7c99517658a691ec7c2d222313f | |
| parent | 258086c904fdf740f73015905ca43ed2081560c8 (diff) | |
| parent | 9a042ebe3a5dd8a47587c72eb3bf4c4b502f1b89 (diff) | |
| download | gitlab-ce-6fdc6976ec1f05d961b1bb4f4904b0d936efe0a0.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 96950fe64ed..d28ad407734 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; } |