Commit 93758584 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'norris-button-replace' into 'master'

Update button element with new code

Closes #219810

See merge request gitlab-org/gitlab!43327
parents 33feba76 ea144f5b
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { GlTooltipDirective, GlLink, GlDeprecatedButton, GlTooltip } from '@gitlab/ui'; import { GlTooltipDirective, GlLink, GlButton, GlTooltip } from '@gitlab/ui';
import CiIconBadge from './ci_badge_link.vue'; import CiIconBadge from './ci_badge_link.vue';
import TimeagoTooltip from './time_ago_tooltip.vue'; import TimeagoTooltip from './time_ago_tooltip.vue';
import UserAvatarImage from './user_avatar/user_avatar_image.vue'; import UserAvatarImage from './user_avatar/user_avatar_image.vue';
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
TimeagoTooltip, TimeagoTooltip,
UserAvatarImage, UserAvatarImage,
GlLink, GlLink,
GlDeprecatedButton, GlButton,
GlTooltip, GlTooltip,
}, },
directives: { directives: {
...@@ -141,14 +141,12 @@ export default { ...@@ -141,14 +141,12 @@ export default {
<section v-if="$slots.default" data-testid="headerButtons" class="gl-display-flex"> <section v-if="$slots.default" data-testid="headerButtons" class="gl-display-flex">
<slot></slot> <slot></slot>
</section> </section>
<gl-deprecated-button <gl-button
v-if="hasSidebarButton" v-if="hasSidebarButton"
id="toggleSidebar" class="d-sm-none js-sidebar-build-toggle gl-ml-auto"
class="d-block d-sm-none icon="angle-double-left"
sidebar-toggle-btn js-sidebar-build-toggle js-sidebar-build-toggle-header" :aria-label="__('Toggle sidebar')"
@click="onClickSidebarButton" @click="onClickSidebarButton"
> />
<i class="fa fa-angle-double-left" aria-hidden="true" aria-labelledby="toggleSidebar"> </i>
</gl-deprecated-button>
</header> </header>
</template> </template>
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