Commit 258c8f0b authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'gl-button-time-tracking' into 'master'

Apply new GitLab UI for learn more button in time tracking in MR sidebar

See merge request gitlab-org/gitlab!54142
parents 60fc7a19 00c0a03d
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { GlButton } from '@gitlab/ui';
import { joinPaths } from '~/lib/utils/url_utility'; import { joinPaths } from '~/lib/utils/url_utility';
import { sprintf, s__ } from '../../../locale'; import { sprintf, s__ } from '../../../locale';
export default { export default {
name: 'TimeTrackingHelpState', name: 'TimeTrackingHelpState',
components: {
GlButton,
},
computed: { computed: {
href() { href() {
return joinPaths(gon.relative_url_root || '', '/help/user/project/time_tracking.md'); return joinPaths(gon.relative_url_root || '', '/help/user/project/time_tracking.md');
...@@ -40,7 +44,7 @@ export default { ...@@ -40,7 +44,7 @@ export default {
<p>{{ __('Quick actions can be used in the issues description and comment boxes.') }}</p> <p>{{ __('Quick actions can be used in the issues description and comment boxes.') }}</p>
<p v-html="estimateText"></p> <p v-html="estimateText"></p>
<p v-html="spendText"></p> <p v-html="spendText"></p>
<a :href="href" class="btn btn-default learn-more-button"> {{ __('Learn more') }} </a> <gl-button :href="href">{{ __('Learn more') }}</gl-button>
</div> </div>
</div> </div>
</template> </template>
---
title: Apply new GitLab UI for learn more button in time tracking
merge_request: 54142
author: Yogi (@yo)
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