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
bc6fe0ce
Commit
bc6fe0ce
authored
Nov 11, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-check icon in importer status
parent
70084dd3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
app/assets/javascripts/importer_status.js
app/assets/javascripts/importer_status.js
+2
-2
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-4
changelogs/unreleased/mw-replace-fa-check-in-importer-status.yml
...ogs/unreleased/mw-replace-fa-check-in-importer-status.yml
+5
-0
No files found.
app/assets/javascripts/importer_status.js
View file @
bc6fe0ce
...
...
@@ -3,7 +3,7 @@ import { escape } from 'lodash';
import
{
__
,
sprintf
}
from
'
./locale
'
;
import
axios
from
'
./lib/utils/axios_utils
'
;
import
{
deprecatedCreateFlash
as
flash
}
from
'
./flash
'
;
import
{
parseBoolean
}
from
'
./lib/utils/common_utils
'
;
import
{
parseBoolean
,
spriteIcon
}
from
'
./lib/utils/common_utils
'
;
class
ImporterStatus
{
constructor
({
jobsUrl
,
importUrl
,
ciCdOnly
})
{
...
...
@@ -108,7 +108,7 @@ class ImporterStatus {
switch
(
job
.
import_status
)
{
case
'
finished
'
:
jobItem
.
removeClass
(
'
table-active
'
).
addClass
(
'
table-success
'
);
statusField
.
html
(
`<span>
<i class="fa fa-check"></i>
${
__
(
'
Done
'
)}
</span>`
);
statusField
.
html
(
`<span>
${
spriteIcon
(
'
check
'
,
'
s16
'
)}
${
__
(
'
Done
'
)}
</span>`
);
break
;
case
'
scheduled
'
:
statusField
.
html
(
`
${
spinner
}
${
__
(
'
Scheduled
'
)}
`
);
...
...
app/assets/stylesheets/fontawesome_custom.scss
View file @
bc6fe0ce
...
...
@@ -92,10 +92,6 @@
content
:
'\f0d7'
;
}
.
fa-check
:
:
before
{
content
:
'\f00c'
;
}
.
fa-warning
:
:
before
,
.
fa-exclamation-triangle
::
before
{
content
:
'\f071'
;
...
...
changelogs/unreleased/mw-replace-fa-check-in-importer-status.yml
0 → 100644
View file @
bc6fe0ce
---
title
:
Replace fa-check icon in importer status
merge_request
:
47373
author
:
type
:
changed
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