diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/assets/javascripts/jobs/components/job_log_controllers.vue | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/assets/javascripts/jobs/components/job_log_controllers.vue')
-rw-r--r-- | app/assets/javascripts/jobs/components/job_log_controllers.vue | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/app/assets/javascripts/jobs/components/job_log_controllers.vue b/app/assets/javascripts/jobs/components/job_log_controllers.vue index 4d314eaa106..7e7d9a0549b 100644 --- a/app/assets/javascripts/jobs/components/job_log_controllers.vue +++ b/app/assets/javascripts/jobs/components/job_log_controllers.vue @@ -1,16 +1,15 @@ <script> -import { GlTooltipDirective, GlLink, GlDeprecatedButton } from '@gitlab/ui'; +/* eslint-disable vue/no-v-html */ +import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui'; import { polyfillSticky } from '~/lib/utils/sticky'; -import Icon from '~/vue_shared/components/icon.vue'; import { numberToHumanSize } from '~/lib/utils/number_utils'; import { __, sprintf } from '~/locale'; import scrollDown from '../svg/scroll_down.svg'; export default { components: { - Icon, GlLink, - GlDeprecatedButton, + GlButton, }, directives: { GlTooltip: GlTooltipDirective, @@ -87,18 +86,17 @@ export default { <div class="controllers float-right"> <!-- links --> - <gl-link + <gl-button v-if="rawPath" v-gl-tooltip.body :title="s__('Job|Show complete raw')" :href="rawPath" class="controllers-buttons" data-testid="job-raw-link-controller" - > - <icon name="doc-text" /> - </gl-link> + icon="doc-text" + /> - <gl-link + <gl-button v-if="erasePath" v-gl-tooltip.body :title="s__('Job|Erase job log')" @@ -107,30 +105,28 @@ export default { class="controllers-buttons" data-testid="job-log-erase-link" data-method="post" - > - <icon name="remove" /> - </gl-link> + icon="remove" + /> <!-- eo links --> <!-- scroll buttons --> <div v-gl-tooltip :title="s__('Job|Scroll to top')" class="controllers-buttons"> - <gl-deprecated-button + <gl-button :disabled="isScrollTopDisabled" - type="button" class="btn-scroll btn-transparent btn-blank" data-testid="job-controller-scroll-top" + icon="scroll_up" @click="handleScrollToTop" - > - <icon name="scroll_up" /> - </gl-deprecated-button> + /> </div> <div v-gl-tooltip :title="s__('Job|Scroll to bottom')" class="controllers-buttons"> - <gl-deprecated-button + <gl-button :disabled="isScrollBottomDisabled" class="js-scroll-bottom btn-scroll btn-transparent btn-blank" - :class="{ animate: isScrollingDown }" data-testid="job-controller-scroll-bottom" + icon="scroll_down" + :class="{ animate: isScrollingDown }" @click="handleScrollToBottom" v-html="$options.scrollDown" /> |