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
d8ccf4a2
Commit
d8ccf4a2
authored
Mar 21, 2022
by
Olena Horal-Koretska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add CSS class for UserAvatarInline rendred with GlAvatar
parent
18e28fc5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image_new.vue
...e_shared/components/user_avatar/user_avatar_image_new.vue
+2
-1
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image_old.vue
...e_shared/components/user_avatar/user_avatar_image_old.vue
+2
-1
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
...ts/vue_shared/components/user_avatar/user_avatar_list.vue
+6
-0
No files found.
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image_new.vue
View file @
d8ccf4a2
...
...
@@ -96,11 +96,12 @@ export default {
/>
<gl-tooltip
v-if=
"tooltipText || $slots.default"
:target=
"() => $refs.userAvatar.$el"
:placement=
"tooltipPlacement"
boundary=
"window"
>
<slot>
{{
tooltipText
}}
</slot>
<slot>
{{
tooltipText
}}
</slot>
</gl-tooltip>
</span>
</
template
>
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image_old.vue
View file @
d8ccf4a2
...
...
@@ -100,11 +100,12 @@ export default {
class="avatar"
/>
<gl-tooltip
v-if=
"tooltipText || $slots.default"
:target=
"() => $refs.userAvatarImage"
:placement=
"tooltipPlacement"
boundary=
"window"
>
<slot>
{{
tooltipText
}}
</slot>
<slot>
{{
tooltipText
}}
</slot>
</gl-tooltip>
</span>
</
template
>
app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_list.vue
View file @
d8ccf4a2
<
script
>
import
glFeatureFlagMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
UserAvatarLink
from
'
./user_avatar_link.vue
'
;
...
...
@@ -8,6 +9,7 @@ export default {
UserAvatarLink
,
GlButton
,
},
mixins
:
[
glFeatureFlagMixin
()],
props
:
{
items
:
{
type
:
Array
,
...
...
@@ -57,6 +59,9 @@ export default {
return
sprintf
(
__
(
'
%{count} more
'
),
{
count
});
},
imgCssClasses
()
{
return
this
.
glFeatures
.
glAvatarForAllUserAvatars
?
'
gl-mr-3
'
:
''
;
},
},
methods
:
{
expand
()
{
...
...
@@ -80,6 +85,7 @@ export default {
:img-alt=
"item.name"
:tooltip-text=
"item.name"
:img-size=
"imgSize"
:img-css-classes=
"imgCssClasses"
/>
<template
v-if=
"hasBreakpoint"
>
<gl-button
v-if=
"hasHiddenItems"
variant=
"link"
@
click=
"expand"
>
...
...
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