Merge branch '225941-replace-fa-file-text-o-icons-with-gitlab-svg-doc-text-icon' into 'master'

Replace fa-file-text-o icons with GitLab SVG doc-text icon

See merge request gitlab-org/gitlab!44706

app/assets/javascripts/ide/components/jobs/detail.vue

@@ -91,7 +91,7 @@ export default {
           class="controllers-buttons"
           target="_blank"
         >
-          <i aria-hidden="true" class="fa fa-file-text-o"></i>
+          <gl-icon name="doc-text" aria-hidden="true" />
         </a>
         <scroll-button :disabled="isScrolledToTop" direction="up" @click="scrollUp" />
         <scroll-button :disabled="isScrolledToBottom" direction="down" @click="scrollDown" />

app/assets/javascripts/project_find_file.js

@@ -5,6 +5,7 @@ import fuzzaldrinPlus from 'fuzzaldrin-plus';
 import { sanitize } from '~/lib/dompurify';
 import axios from '~/lib/utils/axios_utils';
 import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility';
+import { spriteIcon } from '~/lib/utils/common_utils';
 import { deprecatedCreateFlash as flash } from '~/flash';
 import { __ } from '~/locale';
 
@@ -125,7 +126,10 @@ export default class ProjectFindFile {
   // make tbody row html
   static makeHtml(filePath, matches, blobItemUrl) {
     const $tr = $(
-      "<tr class='tree-item'><td class='tree-item-file-name link-container'><a><i class='fa fa-file-text-o fa-fw'></i><span class='str-truncated'></span></a></td></tr>",
+      `<tr class='tree-item'><td class='tree-item-file-name link-container'><a>${spriteIcon(
+        'doc-text',
+        's16 vertical-align-middle gl-mr-1',
+      )}<span class='str-truncated'></span></a></td></tr>`,
     );
     if (matches) {
       $tr

app/views/projects/_import_project_pane.html.haml

@@ -4,7 +4,7 @@
 .project-import
   .form-group.import-btn-container.clearfix
     %h5
-      Import project from
+      = _("Import project from")
     .import-buttons
       - if gitlab_project_import_enabled?
         .import_gitlab_project.has-tooltip{ data: { container: 'body' } }
@@ -64,7 +64,8 @@
       - if manifest_import_enabled?
         %div
           = link_to new_import_manifest_path, class: 'btn import_manifest', **tracking_attrs(track_label, 'click_button', 'manifest_file') do
-            = icon('file-text-o', text: 'Manifest file')
+            = sprite_icon('doc-text')
+            Manifest file
 
       - if phabricator_import_enabled?
         %div

app/views/sherlock/file_samples/show.html.haml

@@ -27,7 +27,7 @@
 
 %article.file-holder
   .js-file-title.file-title
-    %i.fa.fa-file-text-o.fa-fw
+    = sprite_icon("doc-text")
     %strong
       = @file_sample.file
   .code.file-content.js-syntax-highlight

changelogs/unreleased/225941-replace-fa-file-text-o-icons-with-gitlab-svg-doc-text-icon.yml

+---
+title: Replace fa-file-text-o icons with GitLab SVG doc-text icon
+merge_request: 44706
+author:
+type: changed

locale/gitlab.pot

@@ -13541,6 +13541,9 @@ msgstr ""
 msgid "Import project"
 msgstr ""
 
+msgid "Import project from"
+msgstr ""
+
 msgid "Import project members"
 msgstr ""
 

spec/frontend/diffs/mock_data/diff_discussions.js

@@ -264,7 +264,6 @@ export default {
     },
     blob_path: 'CHANGELOG',
     blob_name: 'CHANGELOG',
-    blob_icon: '<i aria-hidden="true" data-hidden="true" class="fa fa-file-text-o fa-fw"></i>',
     file_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
     file_path: 'CHANGELOG.rb',
     new_file: false,

spec/frontend/diffs/mock_data/diff_file.js

@@ -11,7 +11,6 @@ export default {
   },
   blob_path: 'CHANGELOG',
   blob_name: 'CHANGELOG',
-  blob_icon: '<i aria-hidden="true" data-hidden="true" class="fa fa-file-text-o fa-fw"></i>',
   file_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
   file_identifier_hash: '928f8286952bda02d674b692addcbe077084663a',
   file_path: 'CHANGELOG',

spec/frontend/diffs/mock_data/diff_file_unreadable.js

@@ -11,7 +11,6 @@ export default {
   },
   blob_path: 'CHANGELOG',
   blob_name: 'CHANGELOG',
-  blob_icon: '<i aria-hidden="true" data-hidden="true" class="fa fa-file-text-o fa-fw"></i>',
   file_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
   file_path: 'CHANGELOG',
   new_file: false,