Commit df2c3016 authored by Martin Wortschack's avatar Martin Wortschack Committed by Phil Hughes

Replace fa-file-text-o icons

- This replaces several instances
of the fa-file-text-o fontawesome
icon with the GitLab SVG doc-text icon
parent d63a0234
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
class="controllers-buttons" class="controllers-buttons"
target="_blank" target="_blank"
> >
<i aria-hidden="true" class="fa fa-file-text-o"></i> <gl-icon name="doc-text" aria-hidden="true" />
</a> </a>
<scroll-button :disabled="isScrolledToTop" direction="up" @click="scrollUp" /> <scroll-button :disabled="isScrolledToTop" direction="up" @click="scrollUp" />
<scroll-button :disabled="isScrolledToBottom" direction="down" @click="scrollDown" /> <scroll-button :disabled="isScrolledToBottom" direction="down" @click="scrollDown" />
......
...@@ -5,6 +5,7 @@ import fuzzaldrinPlus from 'fuzzaldrin-plus'; ...@@ -5,6 +5,7 @@ import fuzzaldrinPlus from 'fuzzaldrin-plus';
import { sanitize } from '~/lib/dompurify'; import { sanitize } from '~/lib/dompurify';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility'; import { joinPaths, escapeFileUrl } from '~/lib/utils/url_utility';
import { spriteIcon } from '~/lib/utils/common_utils';
import { deprecatedCreateFlash as flash } from '~/flash'; import { deprecatedCreateFlash as flash } from '~/flash';
import { __ } from '~/locale'; import { __ } from '~/locale';
...@@ -125,7 +126,10 @@ export default class ProjectFindFile { ...@@ -125,7 +126,10 @@ export default class ProjectFindFile {
// make tbody row html // make tbody row html
static makeHtml(filePath, matches, blobItemUrl) { static makeHtml(filePath, matches, blobItemUrl) {
const $tr = $( 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) { if (matches) {
$tr $tr
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.project-import .project-import
.form-group.import-btn-container.clearfix .form-group.import-btn-container.clearfix
%h5 %h5
Import project from = _("Import project from")
.import-buttons .import-buttons
- if gitlab_project_import_enabled? - if gitlab_project_import_enabled?
.import_gitlab_project.has-tooltip{ data: { container: 'body' } } .import_gitlab_project.has-tooltip{ data: { container: 'body' } }
...@@ -64,7 +64,8 @@ ...@@ -64,7 +64,8 @@
- if manifest_import_enabled? - if manifest_import_enabled?
%div %div
= link_to new_import_manifest_path, class: 'btn import_manifest', **tracking_attrs(track_label, 'click_button', 'manifest_file') do = 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? - if phabricator_import_enabled?
%div %div
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
%article.file-holder %article.file-holder
.js-file-title.file-title .js-file-title.file-title
%i.fa.fa-file-text-o.fa-fw = sprite_icon("doc-text")
%strong %strong
= @file_sample.file = @file_sample.file
.code.file-content.js-syntax-highlight .code.file-content.js-syntax-highlight
......
---
title: Replace fa-file-text-o icons with GitLab SVG doc-text icon
merge_request: 44706
author:
type: changed
...@@ -13539,6 +13539,9 @@ msgstr "" ...@@ -13539,6 +13539,9 @@ msgstr ""
msgid "Import project" msgid "Import project"
msgstr "" msgstr ""
msgid "Import project from"
msgstr ""
msgid "Import project members" msgid "Import project members"
msgstr "" msgstr ""
......
...@@ -264,7 +264,6 @@ export default { ...@@ -264,7 +264,6 @@ export default {
}, },
blob_path: 'CHANGELOG', blob_path: 'CHANGELOG',
blob_name: '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_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
file_path: 'CHANGELOG.rb', file_path: 'CHANGELOG.rb',
new_file: false, new_file: false,
......
...@@ -11,7 +11,6 @@ export default { ...@@ -11,7 +11,6 @@ export default {
}, },
blob_path: 'CHANGELOG', blob_path: 'CHANGELOG',
blob_name: '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_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
file_identifier_hash: '928f8286952bda02d674b692addcbe077084663a', file_identifier_hash: '928f8286952bda02d674b692addcbe077084663a',
file_path: 'CHANGELOG', file_path: 'CHANGELOG',
......
...@@ -11,7 +11,6 @@ export default { ...@@ -11,7 +11,6 @@ export default {
}, },
blob_path: 'CHANGELOG', blob_path: 'CHANGELOG',
blob_name: '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_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
file_path: 'CHANGELOG', file_path: 'CHANGELOG',
new_file: false, new_file: false,
......
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