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
02996e48
Commit
02996e48
authored
Oct 23, 2020
by
Ezekiel Kigbo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed the `fa-paperclip` icon
Updates references to use the paperclip svg instead of fa-paperclip
parent
2c0cdc7f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
11 deletions
+17
-11
app/assets/javascripts/dropzone_input.js
app/assets/javascripts/dropzone_input.js
+2
-1
app/assets/javascripts/notes/components/note_attachment.vue
app/assets/javascripts/notes/components/note_attachment.vue
+6
-1
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-4
app/views/events/event/_note.html.haml
app/views/events/event/_note.html.haml
+1
-1
app/views/shared/notes/_note.html.haml
app/views/shared/notes/_note.html.haml
+1
-1
spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
...nents/__snapshots__/snippet_description_edit_spec.js.snap
+7
-3
No files found.
app/assets/javascripts/dropzone_input.js
View file @
02996e48
...
...
@@ -7,6 +7,7 @@ import csrf from './lib/utils/csrf';
import
axios
from
'
./lib/utils/axios_utils
'
;
import
{
n__
,
__
}
from
'
~/locale
'
;
import
{
getFilename
}
from
'
~/lib/utils/file_upload
'
;
import
{
spriteIcon
}
from
'
~/lib/utils/common_utils
'
;
Dropzone
.
autoDiscover
=
false
;
...
...
@@ -25,7 +26,7 @@ function getErrorMessage(res) {
export
default
function
dropzoneInput
(
form
,
config
=
{
parallelUploads
:
2
})
{
const
divHover
=
'
<div class="div-dropzone-hover"></div>
'
;
const
iconPaperclip
=
'
<i class="fa fa-paperclip div-dropzone-icon"></i>
'
;
const
iconPaperclip
=
spriteIcon
(
'
paperclip
'
,
'
div-dropzone-icon
'
)
;
const
$attachButton
=
form
.
find
(
'
.button-attach-file
'
);
const
$attachingFileMessage
=
form
.
find
(
'
.attaching-file-message
'
);
const
$cancelButton
=
form
.
find
(
'
.button-cancel-uploading-files
'
);
...
...
app/assets/javascripts/notes/components/note_attachment.vue
View file @
02996e48
<
script
>
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
export
default
{
name
:
'
NoteAttachment
'
,
components
:
{
GlIcon
,
},
props
:
{
attachment
:
{
type
:
Object
,
...
...
@@ -29,7 +34,7 @@ export default {
target=
"_blank"
rel=
"noopener noreferrer"
>
<
i
class=
"fa fa-paperclip"
aria-hidden=
"true"
>
</i
>
{{
attachment
.
filename
}}
<
gl-icon
name=
"paperclip"
/
>
{{
attachment
.
filename
}}
</a>
</div>
</div>
...
...
app/assets/stylesheets/fontawesome_custom.scss
View file @
02996e48
...
...
@@ -117,10 +117,6 @@
content
:
'\f077'
;
}
.
fa-paperclip
:
:
before
{
content
:
'\f0c6'
;
}
.
fa-bug
:
:
before
{
content
:
'\f188'
;
}
...
...
app/views/events/event/_note.html.haml
View file @
02996e48
...
...
@@ -25,5 +25,5 @@
=
image_tag
note
.
attachment
.
url
,
class:
'note-image-attach'
-
else
=
link_to
note
.
attachment
.
url
,
target:
'_blank'
,
class:
'note-file-attach'
do
%i
.fa.fa-paperclip
=
sprite_icon
(
"paperclip"
)
=
note
.
attachment_identifier
app/views/shared/notes/_note.html.haml
View file @
02996e48
...
...
@@ -72,7 +72,7 @@
=
image_tag
note
.
attachment
.
url
,
class:
'note-image-attach'
.attachment
=
link_to
note
.
attachment
.
url
,
target:
'_blank'
do
=
icon
(
'paperclip'
)
=
sprite_
icon
(
'paperclip'
)
=
note
.
attachment_identifier
=
link_to
delete_attachment_project_note_path
(
note
.
project
,
note
),
title:
_
(
'Delete this attachment'
),
method: :delete
,
remote:
true
,
data:
{
confirm:
_
(
'Are you sure you want to remove the attachment?'
)
},
class:
'danger js-note-attachment-delete'
do
...
...
spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
View file @
02996e48
...
...
@@ -52,9 +52,13 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
<div
class="div-dropzone-hover"
>
<i
class="fa fa-paperclip div-dropzone-icon"
/>
<svg
class="div-dropzone-icon"
>
<use
xlink:href="undefined#paperclip"
/>
</svg>
</div>
</div>
...
...
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