Commit 8056349f authored by Nathan Friend's avatar Nathan Friend

Merge branch '216477-gllink-updates' into 'master'

Resolve "Update all `GlLink`s with class="btn" in the Releases pages to use `GlButton` with `href`"

Closes #216477

See merge request gitlab-org/gitlab!31129
parents 03b84967 d4c6bd83
<script> <script>
import { mapState, mapActions } from 'vuex'; import { mapState, mapActions } from 'vuex';
import { GlSkeletonLoading, GlEmptyState, GlLink } from '@gitlab/ui'; import { GlSkeletonLoading, GlEmptyState, GlLink, GlButton } from '@gitlab/ui';
import { import {
getParameterByName, getParameterByName,
historyPushState, historyPushState,
...@@ -18,6 +18,7 @@ export default { ...@@ -18,6 +18,7 @@ export default {
ReleaseBlock, ReleaseBlock,
TablePagination, TablePagination,
GlLink, GlLink,
GlButton,
}, },
props: { props: {
projectId: { projectId: {
...@@ -69,14 +70,16 @@ export default { ...@@ -69,14 +70,16 @@ export default {
</script> </script>
<template> <template>
<div class="flex flex-column mt-2"> <div class="flex flex-column mt-2">
<gl-link <gl-button
v-if="newReleasePath" v-if="newReleasePath"
:href="newReleasePath" :href="newReleasePath"
:aria-describedby="shouldRenderEmptyState && 'releases-description'" :aria-describedby="shouldRenderEmptyState && 'releases-description'"
class="btn btn-success align-self-end mb-2 js-new-release-btn" category="primary"
variant="success"
class="align-self-end mb-2 js-new-release-btn"
> >
{{ __('New release') }} {{ __('New release') }}
</gl-link> </gl-button>
<gl-skeleton-loading v-if="isLoading" class="js-loading" /> <gl-skeleton-loading v-if="isLoading" class="js-loading" />
......
<script> <script>
import { GlTooltipDirective, GlLink, GlBadge } from '@gitlab/ui'; import { GlTooltipDirective, GlLink, GlBadge, GlButton } from '@gitlab/ui';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
import { BACK_URL_PARAM } from '~/releases/constants'; import { BACK_URL_PARAM } from '~/releases/constants';
import { setUrlParams } from '~/lib/utils/url_utility'; import { setUrlParams } from '~/lib/utils/url_utility';
...@@ -10,6 +10,7 @@ export default { ...@@ -10,6 +10,7 @@ export default {
GlLink, GlLink,
GlBadge, GlBadge,
Icon, Icon,
GlButton,
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
...@@ -50,14 +51,16 @@ export default { ...@@ -50,14 +51,16 @@ export default {
__('Upcoming Release') __('Upcoming Release')
}}</gl-badge> }}</gl-badge>
</h2> </h2>
<gl-link <gl-button
v-if="editLink" v-if="editLink"
v-gl-tooltip v-gl-tooltip
class="btn btn-default append-right-10 js-edit-button ml-2" category="primary"
variant="default"
class="append-right-10 js-edit-button ml-2 pb-2"
:title="__('Edit this release')" :title="__('Edit this release')"
:href="editLink" :href="editLink"
> >
<icon name="pencil" /> <icon name="pencil" />
</gl-link> </gl-button>
</div> </div>
</template> </template>
---
title: Update style of buttons on the Releases page
merge_request: 31129
author: Özgür Adem Işıklı @iozguradem
type: changed
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