Commit 939284f1 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'group-weight-icon-and-text' into 'master'

Group weight icon and text on issue list and issue boards

Closes #7741

See merge request gitlab-org/gitlab-ee!7484
parents 52e305d1 9ddbf5d3
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
class="js-no-trigger">{{ issue.title }}</a> class="js-no-trigger">{{ issue.title }}</a>
<span <span
v-if="issueId" v-if="issueId"
class="board-card-number" class="board-card-number append-right-5"
> >
{{ issue.referencePath }} {{ issue.referencePath }}
</span> </span>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
= link_to_label(label, subject: issue.project, css_class: 'label-link') = link_to_label(label, subject: issue.project, css_class: 'label-link')
- if issue.weight - if issue.weight
%span.issuable-weight.has-tooltip{ data: { container: 'body' }, title: _('Weight') } %span.issuable-weight.d-none.d-sm-inline-block.has-tooltip{ data: { container: 'body' }, title: _('Weight') }
&nbsp; &nbsp;
= icon('balance-scale') = icon('balance-scale')
= issue.weight = issue.weight
......
...@@ -23,7 +23,7 @@ export default { ...@@ -23,7 +23,7 @@ export default {
<span <span
v-tooltip v-tooltip
:title="__('Weight')" :title="__('Weight')"
class="board-card-weight card-number prepend-left-5" class="board-card-weight card-number d-inline-block"
data-container="body" data-container="body"
data-placement="bottom" data-placement="bottom"
> >
......
---
title: Group weight icon and text on issue list and issue boards
merge_request: 7484
author: George Tsiolis
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