Commit 6aaafc57 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'dj-fix-dep-table' into 'master'

Improve styling in Dependency List

See merge request gitlab-org/gitlab!45242
parents c6208b6f 9070d97e
<script>
import { uniqueId } from 'lodash';
import { GlButton, GlLink, GlModal, GlModalDirective, GlIntersperse } from '@gitlab/ui';
import {
GlButton,
GlLink,
GlModal,
GlModalDirective,
GlIntersperse,
GlFriendlyWrap,
} from '@gitlab/ui';
import { sprintf, s__ } from '~/locale';
// If there are more licenses than this count, a counter will be displayed for the remaining licenses
......@@ -15,6 +22,7 @@ export default {
GlButton,
GlLink,
GlModal,
GlFriendlyWrap,
},
directives: {
GlModalDirective,
......@@ -70,7 +78,7 @@ export default {
class="js-license-links-license-list-item"
>
<gl-link v-if="license.url" :href="license.url" target="_blank">{{ license.name }}</gl-link>
<template v-else>{{ license.name }}</template>
<gl-friendly-wrap v-else :text="license.name" />
</span>
<gl-button
v-if="hasLicensesInModal"
......
......@@ -63,7 +63,7 @@ export default {
<!-- We need to put an extra span to avoid separator between link & popover -->
<span v-if="showMoreLink">
<gl-link ref="moreLink">{{ nMoreMessage }}</gl-link>
<gl-link ref="moreLink" class="gl-white-space-nowrap">{{ nMoreMessage }}</gl-link>
<gl-popover
:target="() => $refs.moreLink.$el"
......
---
title: Text wrap the license name in Dependency List
merge_request: 45242
author:
type: other
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