Commit e342d150 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch...

Merge branch 'ar-219824-replace-gl-deprecated-button-with-gl-button-in-app-assets-javascripts-jobs-components' into 'master'

Replace <gl-deprecated-button> with <gl-button> in sidebar.vue

Closes #219824

See merge request gitlab-org/gitlab!38939
parents a69607ef 194ec9de
<script> <script>
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { GlLink, GlDeprecatedButton, GlIcon } from '@gitlab/ui'; import { GlLink, GlButton, GlIcon } from '@gitlab/ui';
import { __, sprintf } from '~/locale'; import { __, sprintf } from '~/locale';
import timeagoMixin from '~/vue_shared/mixins/timeago'; import timeagoMixin from '~/vue_shared/mixins/timeago';
import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue';
...@@ -24,7 +24,7 @@ export default { ...@@ -24,7 +24,7 @@ export default {
StagesDropdown, StagesDropdown,
JobsContainer, JobsContainer,
GlLink, GlLink,
GlDeprecatedButton, GlButton,
TooltipOnTruncate, TooltipOnTruncate,
}, },
mixins: [timeagoMixin], mixins: [timeagoMixin],
...@@ -143,14 +143,13 @@ export default { ...@@ -143,14 +143,13 @@ export default {
> >
</div> </div>
<gl-deprecated-button <gl-button
:aria-label="__('Toggle Sidebar')" :aria-label="__('Toggle Sidebar')"
type="button" class="d-md-none gl-ml-2 js-sidebar-build-toggle"
class="btn btn-blank gutter-toggle float-right d-block d-md-none js-sidebar-build-toggle" category="tertiary"
icon="chevron-double-lg-right"
@click="toggleSidebar" @click="toggleSidebar"
> />
<i aria-hidden="true" data-hidden="true" class="fa fa-angle-double-right"></i>
</gl-deprecated-button>
</div> </div>
<div v-if="job.terminal_path || job.new_issue_path" class="block retry-link"> <div v-if="job.terminal_path || job.new_issue_path" class="block retry-link">
......
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