Merge branch 'gt-replace-weight-icon' into 'master'

Replace weight icon

Closes #5340

See merge request gitlab-org/gitlab-ee!8448

app/assets/stylesheets/pages/issuable.scss

@@ -740,6 +740,10 @@
         flex: 1 auto;
         margin-right: 10px;
         min-width: 0;
+
+        .issue-weight-icon {
+          vertical-align: sub;
+        }
       }
 
       .issuable-meta {

app/views/projects/issues/_issue.html.haml

@@ -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

ee/app/assets/javascripts/boards/components/issue_card_weight.vue

@@ -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>

ee/app/assets/javascripts/filtered_search/issues_filtered_search_token_keys.js

@@ -10,7 +10,7 @@ const weightTokenKey = {
   type: 'string',
   param: '',
   symbol: '',
-  icon: 'scale',
+  icon: 'weight',
   tag: 'number',
 };
 

ee/app/assets/javascripts/sidebar/components/weight/weight.vue

@@ -154,7 +154,7 @@ export default {
     >
       <icon
         :size="16"
-        name="scale"
+        name="weight"
       />
       <gl-loading-icon
         v-if="fetching"

ee/app/helpers/ee/system_note_helper.rb

@@ -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

ee/app/views/shared/boards/components/_list_weight.html.haml

 - 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 }}

ee/app/views/shared/milestones/_weight.html.haml

@@ -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

ee/changelogs/unreleased/gt-replace-weight-icon.yml

+---
+title: Replace weight icon
+merge_request: 8448
+author: George Tsiolis
+type: changed

ee/spec/javascripts/filtered_search/issues_filtered_search_token_keys_spec.js

@@ -6,7 +6,7 @@ describe('Filtered Search Token Keys (Issues EE)', () => {
     type: 'string',
     param: '',
     symbol: '',
-    icon: 'scale',
+    icon: 'weight',
     tag: 'number',
   };
 

spec/features/issues_spec.rb

@@ -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