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
f1d4712e
Commit
f1d4712e
authored
Dec 21, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use icon svg instead of fontawesome
parent
36586285
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
24 deletions
+21
-24
app/assets/javascripts/issuable/related_issues/components/issue_item.vue
...scripts/issuable/related_issues/components/issue_item.vue
+6
-9
app/assets/javascripts/issuable/related_issues/components/issue_token.vue
...cripts/issuable/related_issues/components/issue_token.vue
+5
-8
app/assets/javascripts/issuable/related_issues/mixins/related_issues_mixin.js
...ts/issuable/related_issues/mixins/related_issues_mixin.js
+10
-0
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+0
-7
No files found.
app/assets/javascripts/issuable/related_issues/components/issue_item.vue
View file @
f1d4712e
...
...
@@ -33,19 +33,16 @@ export default {
{{
title
}}
</a>
<div
class=
"block text-secondary"
>
<i
ref=
"stateIcon"
<icon
v-if=
"hasState"
v-tooltip
class=
"fa"
:class=
"
{
'issue-token-state-icon-open fa-circle-o': isOpen,
'issue-token-state-icon-closed fa-minus': isClosed,
}"
:css-classes=
"iconClass"
:name=
"iconName"
:size=
"12"
:title=
"stateTitle"
:aria-label=
"state"
>
</i>
{{
displayReference
}}
/
>
{{
displayReference
}}
</div>
</div>
<button
...
...
app/assets/javascripts/issuable/related_issues/components/issue_token.vue
View file @
f1d4712e
...
...
@@ -69,18 +69,15 @@ export default {
'issue-token-reference': isCondensed,
'issuable-info': !isCondensed,
}">
<i
ref=
"stateIcon"
<icon
v-if=
"hasState"
v-tooltip
class=
"fa"
:class=
"
{
'issue-token-state-icon-open fa-circle-o': isOpen,
'issue-token-state-icon-closed fa-minus': isClosed,
}"
:css-classes=
"iconClass"
:name=
"iconName"
:size=
"12"
:title=
"stateTitle"
:aria-label=
"state"
>
/
>
</i>
{{
displayReference
}}
</component>
</component>
...
...
app/assets/javascripts/issuable/related_issues/mixins/related_issues_mixin.js
View file @
f1d4712e
import
tooltip
from
'
../../../vue_shared/directives/tooltip
'
;
import
icon
from
'
../../../vue_shared/components/icon.vue
'
;
import
eventHub
from
'
../event_hub
'
;
const
mixins
=
{
...
...
@@ -42,6 +43,9 @@ const mixins = {
default
:
false
,
},
},
components
:
{
icon
,
},
directives
:
{
tooltip
,
},
...
...
@@ -58,6 +62,12 @@ const mixins = {
hasTitle
()
{
return
this
.
title
.
length
>
0
;
},
iconName
()
{
return
this
.
isOpen
?
'
issue-open-m
'
:
'
cut
'
;
},
iconClass
()
{
return
this
.
isOpen
?
'
issue-token-state-icon-open
'
:
'
issue-token-state-icon-closed
'
;
},
computedLinkElementType
()
{
return
this
.
path
.
length
>
0
?
'
a
'
:
'
span
'
;
},
...
...
app/assets/stylesheets/pages/issues.scss
View file @
f1d4712e
...
...
@@ -374,18 +374,11 @@ ul.related-merge-requests > li {
}
}
@mixin
issue-token-state-icon
{
margin-right
:
0
.35em
;
font-size
:
0
.9em
;
}
.issue-token-state-icon-open
{
@include
issue-token-state-icon
;
color
:
$green-600
;
}
.issue-token-state-icon-closed
{
@include
issue-token-state-icon
;
color
:
$red-600
;
}
...
...
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