diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-15 18:36:26 +0000 |
|---|---|---|
| committer | Chris Peressini <cperessini@gitlab.com> | 2018-06-18 11:13:16 +0200 |
| commit | a0becdab160bf03c48f14dbc0511824000c09fa7 (patch) | |
| tree | 6eb417cfad8b962786191415e187a89646c596e5 | |
| parent | 5738eab5d450a0ea89d938612462cae82870517d (diff) | |
| download | gitlab-ce-a0becdab160bf03c48f14dbc0511824000c09fa7.tar.gz | |
Merge branch 'remove-pointer-events' into 'master'
Remove pointer events in favor of boundary viewport
Closes #46769
See merge request gitlab-org/gitlab-ce!19875
| -rw-r--r-- | app/assets/javascripts/pipelines/components/graph/action_component.vue | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue index 82b4ce083fb..2f888ba5ee3 100644 --- a/app/assets/javascripts/pipelines/components/graph/action_component.vue +++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue @@ -91,7 +91,12 @@ export default { btn-transparent ci-action-icon-container ci-action-icon-wrapper" :class="cssClass" data-container="body" +<<<<<<< HEAD :disabled="isDisabled" +======= + data-boundary="viewport" + @click="onClickAction" +>>>>>>> e3e4a7f3af... Merge branch 'remove-pointer-events' into 'master' > <icon :name="actionIcon"/> </button> diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index c6d63d9bcbf..d92b6f9fe09 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -128,11 +128,6 @@ table { border-spacing: 0; } -.tooltip { - // Fix bootstrap4 bug whereby tooltips flicker when they are hovered over their borders - pointer-events: none; -} - .popover { font-size: 14px; } |