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
e665d8d5
Commit
e665d8d5
authored
Jul 29, 2020
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace fa-certificate with first-contribution SVG
- Replace fontawesome icon for first contribution with Gitlab SVGG
parent
7a89ded4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
38 deletions
+7
-38
app/assets/stylesheets/fontawesome_custom.scss
app/assets/stylesheets/fontawesome_custom.scss
+0
-29
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+1
-8
app/views/projects/notes/_actions.html.haml
app/views/projects/notes/_actions.html.haml
+1
-1
changelogs/unreleased/225921-replace-fa-certificate-icons-with-gitlab-svg-first-contribution-ic.yml
...rtificate-icons-with-gitlab-svg-first-contribution-ic.yml
+5
-0
No files found.
app/assets/stylesheets/fontawesome_custom.scss
View file @
e665d8d5
...
...
@@ -80,31 +80,6 @@
}
}
.fa-stack
{
position
:
relative
;
display
:
inline-block
;
width
:
2em
;
height
:
2em
;
line-height
:
2em
;
vertical-align
:
middle
;
}
.fa-stack-1x
,
.fa-stack-2x
{
position
:
absolute
;
left
:
0
;
width
:
100%
;
text-align
:
center
;
}
.fa-stack-1x
{
line-height
:
inherit
;
}
.fa-stack-2x
{
font-size
:
2em
;
}
.fa-inverse
{
color
:
$white
;
}
...
...
@@ -256,10 +231,6 @@
content
:
'\f111'
;
}
.
fa-certificate
:
:
before
{
content
:
'\f0a3'
;
}
.
fa-bitbucket
:
:
before
{
content
:
'\f171'
;
}
...
...
app/helpers/issuables_helper.rb
View file @
e665d8d5
...
...
@@ -205,7 +205,7 @@ module IssuablesHelper
author_output
end
output
<<
content_tag
(
:span
,
(
issuable_first_contribution_icon
if
issuable
.
first_contribution?
),
class:
'has-tooltip gl-ml-2'
,
title:
_
(
'1st contribution!'
))
output
<<
content_tag
(
:span
,
(
sprite_icon
(
'first-contribution'
,
size:
16
,
css_class:
'gl-icon gl-vertical-align-middle'
)
if
issuable
.
first_contribution?
),
class:
'has-tooltip gl-ml-2'
,
title:
_
(
'1st contribution!'
))
output
<<
content_tag
(
:span
,
(
issuable
.
task_status
if
issuable
.
tasks?
),
id:
"task_status"
,
class:
"d-none d-sm-none d-md-inline-block gl-ml-3"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status_short
if
issuable
.
tasks?
),
id:
"task_status_short"
,
class:
"d-md-none"
)
...
...
@@ -247,13 +247,6 @@ module IssuablesHelper
html
.
html_safe
end
def
issuable_first_contribution_icon
content_tag
(
:span
,
class:
'fa-stack'
)
do
concat
(
icon
(
'certificate'
,
class:
"fa-stack-2x"
))
concat
(
content_tag
(
:strong
,
'1'
,
class:
'fa-inverse fa-stack-1x'
))
end
end
def
assigned_issuables_count
(
issuable_type
)
case
issuable_type
when
:issues
...
...
app/views/projects/notes/_actions.html.haml
View file @
e665d8d5
-
access
=
note_max_access_for_user
(
note
)
-
if
note
.
has_special_role?
(
Note
::
SpecialRole
::
FIRST_TIME_CONTRIBUTOR
)
%span
.note-role.note-role-special.has-tooltip
{
title:
_
(
"This is the author's first Merge Request to this project."
)
}
=
issuable_first_contribution_icon
=
sprite_icon
(
'first-contribution'
,
size:
16
,
css_class:
'gl-icon gl-vertical-align-top'
)
-
if
access
.
nonzero?
%span
.note-role.user-access-role
=
Gitlab
::
Access
.
human_access
(
access
)
...
...
changelogs/unreleased/225921-replace-fa-certificate-icons-with-gitlab-svg-first-contribution-ic.yml
0 → 100644
View file @
e665d8d5
---
title
:
Replace fa-certificate icon with first-contribution svg
merge_request
:
38154
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