Commit ce32fa31 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'marcel-update-deprecated-button-3' into 'master'

Update gldeprecatedbutton to glbutton

Closes #219775

See merge request gitlab-org/gitlab!38763
parents 194eee15 c8240bf3
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { GlTooltipDirective, GlLink, GlDeprecatedButton, GlIcon } from '@gitlab/ui'; import { GlTooltipDirective, GlLink, GlButton } from '@gitlab/ui';
import { polyfillSticky } from '~/lib/utils/sticky'; import { polyfillSticky } from '~/lib/utils/sticky';
import { numberToHumanSize } from '~/lib/utils/number_utils'; import { numberToHumanSize } from '~/lib/utils/number_utils';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
...@@ -8,9 +8,8 @@ import scrollDown from '../svg/scroll_down.svg'; ...@@ -8,9 +8,8 @@ import scrollDown from '../svg/scroll_down.svg';
export default { export default {
components: { components: {
GlIcon,
GlLink, GlLink,
GlDeprecatedButton, GlButton,
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
...@@ -87,18 +86,17 @@ export default { ...@@ -87,18 +86,17 @@ export default {
<div class="controllers float-right"> <div class="controllers float-right">
<!-- links --> <!-- links -->
<gl-link <gl-button
v-if="rawPath" v-if="rawPath"
v-gl-tooltip.body v-gl-tooltip.body
:title="s__('Job|Show complete raw')" :title="s__('Job|Show complete raw')"
:href="rawPath" :href="rawPath"
class="controllers-buttons" class="controllers-buttons"
data-testid="job-raw-link-controller" data-testid="job-raw-link-controller"
> icon="doc-text"
<gl-icon name="doc-text" /> />
</gl-link>
<gl-link <gl-button
v-if="erasePath" v-if="erasePath"
v-gl-tooltip.body v-gl-tooltip.body
:title="s__('Job|Erase job log')" :title="s__('Job|Erase job log')"
...@@ -107,30 +105,28 @@ export default { ...@@ -107,30 +105,28 @@ export default {
class="controllers-buttons" class="controllers-buttons"
data-testid="job-log-erase-link" data-testid="job-log-erase-link"
data-method="post" data-method="post"
> icon="remove"
<gl-icon name="remove" /> />
</gl-link>
<!-- eo links --> <!-- eo links -->
<!-- scroll buttons --> <!-- scroll buttons -->
<div v-gl-tooltip :title="s__('Job|Scroll to top')" class="controllers-buttons"> <div v-gl-tooltip :title="s__('Job|Scroll to top')" class="controllers-buttons">
<gl-deprecated-button <gl-button
:disabled="isScrollTopDisabled" :disabled="isScrollTopDisabled"
type="button"
class="btn-scroll btn-transparent btn-blank" class="btn-scroll btn-transparent btn-blank"
data-testid="job-controller-scroll-top" data-testid="job-controller-scroll-top"
icon="scroll_up"
@click="handleScrollToTop" @click="handleScrollToTop"
> />
<gl-icon name="scroll_up" />
</gl-deprecated-button>
</div> </div>
<div v-gl-tooltip :title="s__('Job|Scroll to bottom')" class="controllers-buttons"> <div v-gl-tooltip :title="s__('Job|Scroll to bottom')" class="controllers-buttons">
<gl-deprecated-button <gl-button
:disabled="isScrollBottomDisabled" :disabled="isScrollBottomDisabled"
class="js-scroll-bottom btn-scroll btn-transparent btn-blank" class="js-scroll-bottom btn-scroll btn-transparent btn-blank"
:class="{ animate: isScrollingDown }"
data-testid="job-controller-scroll-bottom" data-testid="job-controller-scroll-bottom"
icon="scroll_down"
:class="{ animate: isScrollingDown }"
@click="handleScrollToBottom" @click="handleScrollToBottom"
v-html="$options.scrollDown" v-html="$options.scrollDown"
/> />
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
} }
.top-bar { .top-bar {
@include build-trace-top-bar(35px); @include build-trace-top-bar(50px);
&.has-archived-block { &.has-archived-block {
top: $header-height + 28px; top: $header-height + 28px;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment