Commit fa90a16e authored by George Tsiolis's avatar George Tsiolis

Replace weight icon

parent d786cf32
......@@ -740,6 +740,10 @@
flex: 1 auto;
margin-right: 10px;
min-width: 0;
.issue-weight-icon {
vertical-align: sub;
}
}
.issuable-meta {
......
......@@ -42,7 +42,7 @@
- if issue.weight
%span.issuable-weight.d-none.d-sm-inline-block.has-tooltip{ data: { container: 'body' }, title: _('Weight') }
 
= icon('balance-scale')
= sprite_icon('weight', size: 16, css_class: 'issue-weight-icon')
= issue.weight
.issuable-meta
......
......@@ -30,7 +30,7 @@ export default {
v-on="$listeners"
>
<icon
name="scale"
name="weight"
css-classes="board-card-info-icon"
/><span class="board-card-info-text">{{ weight }}</span>
</a>
......
......@@ -10,7 +10,7 @@ const weightTokenKey = {
type: 'string',
param: '',
symbol: '',
icon: 'scale',
icon: 'weight',
tag: 'number',
};
......
......@@ -154,7 +154,7 @@ export default {
>
<icon
:size="16"
name="scale"
name="weight"
/>
<gl-loading-icon
v-if="fetching"
......
......@@ -14,7 +14,7 @@ module EE
'issue_removed_from_epic' => 'epic',
'issue_changed_epic' => 'epic',
'epic_date_changed' => 'calendar',
'weight' => 'scale'
'weight' => 'weight'
}.freeze
override :system_note_icon_name
......
- if (@group || @project)&.feature_available?(:issue_weights)
%span.d-inline-flex.ml-2
%icon.mr-1{ name: "scale" }
%icon.mr-1{ name: "weight" }
{{ list.totalWeight }}
......@@ -5,7 +5,7 @@
- total_weight = milestone.issues_visible_to_user(current_user).sum(:weight) # rubocop: disable CodeReuse/ActiveRecord
.block.weight
.sidebar-collapsed-icon.has-tooltip{ title: milestone_weight_tooltip_text(total_weight), data: { container: 'body', placement: 'left' } }
= icon('balance-scale')
= sprite_icon('weight', size: 16)
%span
- unless total_weight.zero?
= total_weight
......
---
title: Replace weight icon
merge_request: 8448
author: George Tsiolis
type: changed
......@@ -6,7 +6,7 @@ describe('Filtered Search Token Keys (Issues EE)', () => {
type: 'string',
param: '',
symbol: '',
icon: 'scale',
icon: 'weight',
tag: 'number',
};
......
......@@ -179,7 +179,7 @@ describe 'Issues' do
visit project_issues_path(project)
page.within(first('.issuable-info')) do
expect(page).to have_selector('.fa-balance-scale')
expect(page).to have_selector('.issue-weight-icon')
expect(page).to have_content(2)
end
end
......
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