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
21015953
Commit
21015953
authored
Oct 20, 2020
by
Alexis Ginsberg
Committed by
jboyson
Oct 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply some of Simons suggestions to tooltips
parent
2c1872cf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
app/assets/javascripts/related_issues/components/issue_token.vue
...ets/javascripts/related_issues/components/issue_token.vue
+7
-4
app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
...s/javascripts/vue_shared/mixins/related_issuable_mixin.js
+0
-4
No files found.
app/assets/javascripts/related_issues/components/issue_token.vue
View file @
21015953
<
script
>
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
GlIcon
,
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
__
,
sprintf
}
from
'
~/locale
'
;
import
relatedIssuableMixin
from
'
~/vue_shared/mixins/related_issuable_mixin
'
;
...
...
@@ -8,6 +8,9 @@ export default {
components
:
{
GlIcon
,
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
mixins
:
[
relatedIssuableMixin
],
props
:
{
isCondensed
:
{
...
...
@@ -52,7 +55,7 @@ export default {
<component
:is=
"computedLinkElementType"
ref=
"link"
v-tooltip
v-
gl-
tooltip
:class=
"
{
'issue-token-link': isCondensed,
'issuable-main-info': !isCondensed,
...
...
@@ -84,7 +87,7 @@ export default {
>
<gl-icon
v-if=
"hasState"
v-tooltip
v-
gl-
tooltip
:class=
"iconClass"
:name=
"iconName"
:size=
"12"
...
...
@@ -98,7 +101,7 @@ export default {
<button
v-if=
"canRemove"
ref=
"removeButton"
v-tooltip
v-
gl-
tooltip
:class=
"
{
'issue-token-remove-button': isCondensed,
'btn btn-default': !isCondensed,
...
...
app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
View file @
21015953
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
isEmpty
}
from
'
lodash
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
{
formatDate
}
from
'
~/lib/utils/datetime_utility
'
;
...
...
@@ -99,9 +98,6 @@ const mixins = {
default
:
()
=>
({}),
},
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
mixins
:
[
timeagoMixin
],
computed
:
{
hasState
()
{
...
...
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