diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 09:07:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 09:07:45 +0000 |
commit | f4186a753b86625a83e8499af14b5badd63a2ac2 (patch) | |
tree | b960dd9f4255e9eee9f87d28e853f163836aa4c5 /app/assets/javascripts/vue_shared | |
parent | 0221116862ee66024a03492b4fbbe4e069d84303 (diff) | |
download | gitlab-ce-f4186a753b86625a83e8499af14b5badd63a2ac2.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
3 files changed, 8 insertions, 114 deletions
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue index 4abf7c478ee..fe43f77b1ee 100644 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue +++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue @@ -1,12 +1,10 @@ <script> -import DropdownValueScopedLabel from './dropdown_value_scoped_label.vue'; -import DropdownValueRegularLabel from './dropdown_value_regular_label.vue'; +import { GlLabel } from '@gitlab/ui'; import { isScopedLabel } from '~/lib/utils/common_utils'; export default { components: { - DropdownValueScopedLabel, - DropdownValueRegularLabel, + GlLabel, }, props: { labels: { @@ -37,12 +35,6 @@ export default { labelFilterUrl(label) { return `${this.labelFilterBasePath}?label_name[]=${encodeURIComponent(label.title)}`; }, - labelStyle(label) { - return { - color: label.textColor, - backgroundColor: label.color, - }; - }, scopedLabelsDescription({ description = '' }) { return `<span class="font-weight-bold scoped-label-tooltip-title">Scoped label</span><br />${description}`; }, @@ -65,22 +57,15 @@ export default { </span> <template v-for="label in labels" v-else> - <dropdown-value-scoped-label - v-if="showScopedLabels(label)" + <gl-label :key="label.id" - :label="label" - :label-filter-url="labelFilterUrl(label)" - :label-style="labelStyle(label)" + :target="labelFilterUrl(label)" + :background-color="label.color" + :title="label.title" + :description="label.description" + :scoped="showScopedLabels(label)" :scoped-labels-documentation-link="scopedLabelsDocumentationLink" /> - - <dropdown-value-regular-label - v-else - :key="label.id" - :label="label" - :label-filter-url="labelFilterUrl(label)" - :label-style="labelStyle(label)" - /> </template> </div> </template> diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_regular_label.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_regular_label.vue deleted file mode 100644 index 839117becd9..00000000000 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_regular_label.vue +++ /dev/null @@ -1,39 +0,0 @@ -<script> -import { GlTooltip } from '@gitlab/ui'; - -export default { - components: { - GlTooltip, - }, - props: { - label: { - type: Object, - required: true, - }, - labelStyle: { - type: Object, - required: true, - }, - labelFilterUrl: { - type: String, - required: true, - }, - }, -}; -</script> - -<template> - <a ref="regularLabelRef" :href="labelFilterUrl"> - <span :style="labelStyle" class="badge color-label"> - {{ label.title }} - </span> - <gl-tooltip - v-if="label.description" - :target="() => $refs.regularLabelRef" - placement="top" - boundary="viewport" - > - {{ label.description }} - </gl-tooltip> - </a> -</template> diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_scoped_label.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_scoped_label.vue deleted file mode 100644 index 94587e1cbab..00000000000 --- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_scoped_label.vue +++ /dev/null @@ -1,52 +0,0 @@ -<script> -import { GlLink, GlTooltip } from '@gitlab/ui'; - -export default { - components: { - GlTooltip, - GlLink, - }, - props: { - label: { - type: Object, - required: true, - }, - labelStyle: { - type: Object, - required: true, - }, - scopedLabelsDocumentationLink: { - type: String, - required: true, - }, - labelFilterUrl: { - type: String, - required: true, - }, - }, -}; -</script> - -<template> - <span class="d-inline-block position-relative scoped-label-wrapper"> - <a :href="labelFilterUrl"> - <span :ref="`labelTitleRef`" :style="labelStyle" class="badge color-label label"> - {{ label.title }} - </span> - <gl-tooltip - v-if="label.description" - :target="() => $refs.labelTitleRef" - placement="top" - boundary="viewport" - > - <span class="font-weight-bold scoped-label-tooltip-title">{{ __('Scoped label') }}</span - ><br /> - {{ label.description }} - </gl-tooltip> - </a> - - <gl-link :href="scopedLabelsDocumentationLink" target="_blank" class="label scoped-label" - ><i class="fa fa-question-circle" :style="labelStyle"></i - ></gl-link> - </span> -</template> |