Commit cc864263 authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch 'mw-replace-fa-icon-in-repo-preview' into 'master'

Replace fa-file-text-o icon with GitLab SVG in repository preview

See merge request gitlab-org/gitlab!44696
parents 3a98d7a0 3993359b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import $ from 'jquery'; import $ from 'jquery';
import '~/behaviors/markdown/render_gfm'; import '~/behaviors/markdown/render_gfm';
import { GlLink, GlLoadingIcon } from '@gitlab/ui'; import { GlIcon, GlLink, GlLoadingIcon } from '@gitlab/ui';
import { handleLocationHash } from '~/lib/utils/common_utils'; import { handleLocationHash } from '~/lib/utils/common_utils';
import readmeQuery from '../../queries/readme.query.graphql'; import readmeQuery from '../../queries/readme.query.graphql';
...@@ -19,6 +19,7 @@ export default { ...@@ -19,6 +19,7 @@ export default {
}, },
}, },
components: { components: {
GlIcon,
GlLink, GlLink,
GlLoadingIcon, GlLoadingIcon,
}, },
...@@ -51,7 +52,7 @@ export default { ...@@ -51,7 +52,7 @@ export default {
<article class="file-holder limited-width-container readme-holder"> <article class="file-holder limited-width-container readme-holder">
<div class="js-file-title file-title-flex-parent"> <div class="js-file-title file-title-flex-parent">
<div class="file-header-content"> <div class="file-header-content">
<i aria-hidden="true" class="fa fa-file-text-o fa-fw"></i> <gl-icon name="doc-text" aria-hidden="true" />
<gl-link :href="blob.webPath"> <gl-link :href="blob.webPath">
<strong>{{ blob.name }}</strong> <strong>{{ blob.name }}</strong>
</gl-link> </gl-link>
......
---
title: Replace fa icon with GitLab SVG in repository preview
merge_request: 44696
author:
type: changed
...@@ -10,9 +10,10 @@ exports[`Repository file preview component renders file HTML 1`] = ` ...@@ -10,9 +10,10 @@ exports[`Repository file preview component renders file HTML 1`] = `
<div <div
class="file-header-content" class="file-header-content"
> >
<i <gl-icon-stub
aria-hidden="true" aria-hidden="true"
class="fa fa-file-text-o fa-fw" name="doc-text"
size="16"
/> />
<gl-link-stub <gl-link-stub
......
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