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
90c8824b
Commit
90c8824b
authored
Aug 29, 2019
by
Martin Wortschack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix group styles in dropdown
- Indent group path
parent
e747d771
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
ee/app/assets/javascripts/analytics/shared/components/groups_dropdown_filter.vue
...ts/analytics/shared/components/groups_dropdown_filter.vue
+3
-3
ee/changelogs/unreleased/mw-groups-dropdown-style-fixes.yml
ee/changelogs/unreleased/mw-groups-dropdown-style-fixes.yml
+5
-0
No files found.
ee/app/assets/javascripts/analytics/shared/components/groups_dropdown_filter.vue
View file @
90c8824b
...
@@ -71,7 +71,7 @@ export default {
...
@@ -71,7 +71,7 @@ export default {
rowTemplate
(
group
)
{
rowTemplate
(
group
)
{
return
`
return
`
<li>
<li>
<a href='#' class='dropdown-menu-link'>
<a href='#' class='dropdown-menu-link
d-flex
'>
${
this
.
avatarTemplate
(
group
)}
${
this
.
avatarTemplate
(
group
)}
<div class="js-group-path align-middle">
${
this
.
formatGroupPath
(
<div class="js-group-path align-middle">
${
this
.
formatGroupPath
(
group
.
full_name
,
group
.
full_name
,
...
@@ -100,9 +100,9 @@ export default {
...
@@ -100,9 +100,9 @@ export default {
},
},
avatarTemplate
(
group
)
{
avatarTemplate
(
group
)
{
return
group
.
avatar_url
!==
null
return
group
.
avatar_url
!==
null
?
renderAvatar
(
group
,
{
sizeClass
:
'
s16 rect-avatar
'
})
?
renderAvatar
(
group
,
{
sizeClass
:
'
s16 rect-avatar
flex-shrink-0
'
})
:
renderIdenticon
(
group
,
{
:
renderIdenticon
(
group
,
{
sizeClass
:
'
s16 rect-avatar d-flex justify-content-center flex-column
'
,
sizeClass
:
'
s16 rect-avatar d-flex justify-content-center flex-column
flex-shrink-0
'
,
});
});
},
},
},
},
...
...
ee/changelogs/unreleased/mw-groups-dropdown-style-fixes.yml
0 → 100644
View file @
90c8824b
---
title
:
'
Groups
dropdown:
Fix
group
styles
in
dropdown'
merge_request
:
15839
author
:
type
:
other
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