diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue')
-rw-r--r-- | app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue index 07b0d55bd4c..431819124c2 100644 --- a/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue +++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue @@ -1,12 +1,11 @@ <script> -import { GlPopover, GlIcon, GlDeprecatedButton, GlTooltipDirective } from '@gitlab/ui'; +import { GlPopover, GlButton, GlTooltipDirective } from '@gitlab/ui'; export default { maxTextLength: 95, components: { GlPopover, - GlIcon, - GlDeprecatedButton, + GlButton, }, directives: { GlTooltip: GlTooltipDirective, @@ -39,16 +38,18 @@ export default { <template> <div id="popover-container"> <gl-popover :target="target" triggers="hover" placement="top" container="popover-container"> - <div class="d-flex justify-content-between position-relative"> - <div class="pr-5 w-100 ci-popover-value">{{ displayValue }}</div> - <gl-deprecated-button + <div class="gl-display-flex gl-justify-content-space-between gl-align-items-center"> + <div class="ci-popover-value gl-pr-3"> + {{ displayValue }} + </div> + <gl-button v-gl-tooltip - class="btn-transparent btn-clipboard position-absolute position-top-0 position-right-0" + category="tertiary" + icon="copy-to-clipboard" :title="tooltipText" :data-clipboard-text="value" - > - <gl-icon name="copy-to-clipboard" /> - </gl-deprecated-button> + :aria-label="__('Copy to clipboard')" + /> </div> </gl-popover> </div> |