Commit dbff4879 authored by Illya Klymov's avatar Illya Klymov

Merge branch 'jnnkl-gl-badges-environment-item' into 'master'

Refactored Badges on environment items

See merge request gitlab-org/gitlab!77113
parents 9f6038f2 055cd12f
<script> <script>
import { GlDropdown, GlTooltipDirective, GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; import { GlDropdown, GlTooltipDirective, GlIcon, GlLink, GlSprintf, GlBadge } from '@gitlab/ui';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import { __, s__, sprintf } from '~/locale'; import { __, s__, sprintf } from '~/locale';
...@@ -30,6 +30,7 @@ export default { ...@@ -30,6 +30,7 @@ export default {
CommitComponent, CommitComponent,
ExternalUrlComponent, ExternalUrlComponent,
GlDropdown, GlDropdown,
GlBadge,
GlIcon, GlIcon,
GlLink, GlLink,
GlSprintf, GlSprintf,
...@@ -621,9 +622,9 @@ export default { ...@@ -621,9 +622,9 @@ export default {
<span v-if="model.size === 1">{{ model.name }}</span> <span v-if="model.size === 1">{{ model.name }}</span>
<span v-else>{{ model.name_without_type }}</span> <span v-else>{{ model.name_without_type }}</span>
</a> </a>
<span v-if="isProtected" class="badge badge-success"> <gl-badge v-if="isProtected" variant="success">{{
{{ s__('Environments|protected') }} s__('Environments|protected')
</span> }}</gl-badge>
</span> </span>
<span <span
v-else v-else
...@@ -639,7 +640,7 @@ export default { ...@@ -639,7 +640,7 @@ export default {
<span> {{ model.folderName }} </span> <span> {{ model.folderName }} </span>
<span class="badge badge-pill"> {{ model.size }} </span> <gl-badge>{{ model.size }}</gl-badge>
</span> </span>
</div> </div>
......
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