Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4a25c47c
Commit
4a25c47c
authored
Jun 10, 2020
by
Jeremy Elder
Committed by
Tim Zallmann
Jun 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-file-image-o with GitLab media icon
parent
f5df1117
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
5 deletions
+17
-5
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
...ts/javascripts/vue_shared/components/markdown/toolbar.vue
+12
-5
changelogs/unreleased/220954-replace-fa-file-image-o-with-gitlab-media-icon.yml
...220954-replace-fa-file-image-o-with-gitlab-media-icon.yml
+5
-0
No files found.
app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
View file @
4a25c47c
<
script
>
<
script
>
import
{
GlButton
,
GlLink
,
GlLoadingIcon
,
GlSprintf
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLink
,
GlLoadingIcon
,
GlSprintf
,
GlIcon
}
from
'
@gitlab/ui
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
@@ -7,6 +7,7 @@ export default {
...
@@ -7,6 +7,7 @@ export default {
GlLink
,
GlLink
,
GlLoadingIcon
,
GlLoadingIcon
,
GlSprintf
,
GlSprintf
,
GlIcon
,
},
},
props
:
{
props
:
{
markdownDocsPath
:
{
markdownDocsPath
:
{
...
@@ -59,7 +60,9 @@ export default {
...
@@ -59,7 +60,9 @@ export default {
</div>
</div>
<span
v-if=
"canAttachFile"
class=
"uploading-container"
>
<span
v-if=
"canAttachFile"
class=
"uploading-container"
>
<span
class=
"uploading-progress-container hide"
>
<span
class=
"uploading-progress-container hide"
>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
></i>
<
template
>
<gl-icon
name=
"media"
:size=
"16"
/>
</
template
>
<span
class=
"attaching-file-message"
></span>
<span
class=
"attaching-file-message"
></span>
<!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings -->
<!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings -->
<span
class=
"uploading-progress"
>
0%
</span>
<span
class=
"uploading-progress"
>
0%
</span>
...
@@ -67,7 +70,9 @@ export default {
...
@@ -67,7 +70,9 @@ export default {
</span>
</span>
<span
class=
"uploading-error-container hide"
>
<span
class=
"uploading-error-container hide"
>
<span
class=
"uploading-error-icon"
>
<span
class=
"uploading-error-icon"
>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
></i>
<
template
>
<gl-icon
name=
"media"
:size=
"16"
/>
</
template
>
</span>
</span>
<span
class=
"uploading-error-message"
></span>
<span
class=
"uploading-error-message"
></span>
...
@@ -87,8 +92,10 @@ export default {
...
@@ -87,8 +92,10 @@ export default {
</gl-sprintf>
</gl-sprintf>
</span>
</span>
<gl-button
class=
"markdown-selector button-attach-file"
variant=
"link"
>
<gl-button
class=
"markdown-selector button-attach-file"
variant=
"link"
>
<i
class=
"fa fa-file-image-o toolbar-button-icon"
aria-hidden=
"true"
></i
<
template
>
><span
class=
"text-attach-file"
>
{{ __('Attach a file') }}
</span>
<gl-icon
name=
"media"
:size=
"16"
/>
</
template
>
<span
class=
"text-attach-file"
>
{{ __('Attach a file') }}
</span>
</gl-button>
</gl-button>
<gl-button
class=
"btn btn-default btn-sm hide button-cancel-uploading-files"
variant=
"link"
>
<gl-button
class=
"btn btn-default btn-sm hide button-cancel-uploading-files"
variant=
"link"
>
{{ __('Cancel') }}
{{ __('Cancel') }}
...
...
changelogs/unreleased/220954-replace-fa-file-image-o-with-gitlab-media-icon.yml
0 → 100644
View file @
4a25c47c
---
title
:
Use GitLab SVG icon for file attacher action
merge_request
:
34196
author
:
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment