Commit b4e28a40 authored by Mark Florian's avatar Mark Florian

Merge branch '344305-suggestion_diff_header-badges-pajamas-compliant' into 'master'

Migrate badge in suggestion_diff_header.vue to GlBadge

See merge request gitlab-org/gitlab!73425
parents 8e4c4cf0 ee87b84f
<script> <script>
import { GlButton, GlLoadingIcon, GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { GlBadge, GlButton, GlLoadingIcon, GlTooltipDirective, GlIcon } from '@gitlab/ui';
import { isLoggedIn } from '~/lib/utils/common_utils'; import { isLoggedIn } from '~/lib/utils/common_utils';
import { __ } from '~/locale'; import { __ } from '~/locale';
import ApplySuggestion from './apply_suggestion.vue'; import ApplySuggestion from './apply_suggestion.vue';
export default { export default {
components: { GlIcon, GlButton, GlLoadingIcon, ApplySuggestion }, components: { GlBadge, GlIcon, GlButton, GlLoadingIcon, ApplySuggestion },
directives: { 'gl-tooltip': GlTooltipDirective }, directives: { 'gl-tooltip': GlTooltipDirective },
props: { props: {
batchSuggestionsCount: { batchSuggestionsCount: {
...@@ -134,9 +134,9 @@ export default { ...@@ -134,9 +134,9 @@ export default {
<gl-icon name="question-o" css-classes="link-highlight" /> <gl-icon name="question-o" css-classes="link-highlight" />
</a> </a>
</div> </div>
<div v-if="isApplied" class="badge badge-success" data-qa-selector="applied_badge"> <gl-badge v-if="isApplied" variant="success" data-qa-selector="applied_badge">
{{ __('Applied') }} {{ __('Applied') }}
</div> </gl-badge>
<div <div
v-else-if="isApplying" v-else-if="isApplying"
class="d-flex align-items-center text-secondary" class="d-flex align-items-center text-secondary"
......
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