summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-29 15:30:56 +0000
committerPhil Hughes <me@iamphill.com>2017-09-29 15:30:56 +0000
commit0e82f6d38d5a186634e70e3eafa9e3e74cf8d5dd (patch)
treeea6dcf4e6dab7aed3cc4ff6df5653267664eb529
parent49fdaf9ee8e939be389da65a0a691ce0c8b498c2 (diff)
parent387975fe1ae3d099fa737c13cf533ad9664beb2e (diff)
downloadgitlab-ce-0e82f6d38d5a186634e70e3eafa9e3e74cf8d5dd.tar.gz
Merge branch '38582-popover-badge' into 'master'
Improves UX of autodevops popover to match gpg one Closes #38582 See merge request gitlab-org/gitlab-ce!14582
-rw-r--r--app/assets/javascripts/pipelines/components/pipeline_url.vue4
-rw-r--r--changelogs/unreleased/38582-popover-badge.yml5
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipeline_url.vue b/app/assets/javascripts/pipelines/components/pipeline_url.vue
index f0b44dfa6d8..76b97af39f1 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_url.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_url.vue
@@ -28,8 +28,7 @@
popoverOptions() {
return {
html: true,
- delay: { hide: 600 },
- trigger: 'hover',
+ trigger: 'focus',
placement: 'top',
title: '<div class="autodevops-title">This pipeline makes use of a predefined CI/CD configuration enabled by <b>Auto DevOps.</b></div>',
content: `<a class="autodevops-link" href="${this.autoDevopsHelpPath}" target="_blank" rel="noopener noreferrer nofollow">Learn more about Auto DevOps</a>`,
@@ -75,6 +74,7 @@
</span>
<a
v-if="pipeline.flags.auto_devops"
+ tabindex="0"
class="js-pipeline-url-autodevops label label-info autodevops-badge"
v-popover="popoverOptions"
role="button">
diff --git a/changelogs/unreleased/38582-popover-badge.yml b/changelogs/unreleased/38582-popover-badge.yml
new file mode 100644
index 00000000000..ccec679a13f
--- /dev/null
+++ b/changelogs/unreleased/38582-popover-badge.yml
@@ -0,0 +1,5 @@
+---
+title: Improves UX of autodevops popover to match gpg one
+merge_request:
+author:
+type: fixed