summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Gray <annabel.m.gray@gmail.com>2018-06-15 18:36:26 +0000
committerAnnabel Gray <annabel.m.gray@gmail.com>2018-06-15 18:36:26 +0000
commite3e4a7f3afb843a8962100bbbb5eeccb0b43d096 (patch)
treeeb10de8d8f704992fe5956ff4c60807881fd0f68
parentf2400ed1f3d9440bd58102774ae93cfa63ce74e0 (diff)
parentc3aa36d035da3cf5e245eac12aa6c3ffcb27cf98 (diff)
downloadgitlab-ce-e3e4a7f3afb843a8962100bbbb5eeccb0b43d096.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.vue1
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss5
2 files changed, 1 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 db0505a55fe..1f152ed438d 100644
--- a/app/assets/javascripts/pipelines/components/graph/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue
@@ -91,6 +91,7 @@ export default {
class="js-ci-action btn btn-blank
btn-transparent ci-action-icon-container ci-action-icon-wrapper"
data-container="body"
+ data-boundary="viewport"
@click="onClickAction"
>
<icon :name="actionIcon"/>
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 5da0e672288..c3ba62805dc 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;
}