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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
69f0daf7
Commit
69f0daf7
authored
Aug 07, 2018
by
Adriel Santiago
Committed by
Fatih Acet
Aug 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Group dashboard > Line height is too tall for group names"
parent
89b2df9b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
80 additions
and
55 deletions
+80
-55
app/assets/javascripts/groups/components/group_item.vue
app/assets/javascripts/groups/components/group_item.vue
+41
-34
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+3
-0
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+31
-21
changelogs/unreleased/46703-group-dashboard-line-height-is-too-tall-for-group-names.yml
...oup-dashboard-line-height-is-too-tall-for-group-names.yml
+5
-0
No files found.
app/assets/javascripts/groups/components/group_item.vue
View file @
69f0daf7
...
@@ -78,17 +78,10 @@ export default {
...
@@ -78,17 +78,10 @@ export default {
>
>
<div
<div
:class=
"
{ 'project-row-contents': !isGroup }"
:class=
"
{ 'project-row-contents': !isGroup }"
class="group-row-contents">
class="group-row-contents d-flex justify-content-end align-items-center"
<item-actions
>
v-if=
"isGroup"
:group=
"group"
:parent-group=
"parentGroup"
/>
<item-stats
:item=
"group"
/>
<div
<div
class=
"folder-toggle-wrap"
class=
"folder-toggle-wrap
append-right-4 d-flex align-items-center
"
>
>
<item-caret
<item-caret
:is-group-open=
"group.isOpen"
:is-group-open=
"group.isOpen"
...
@@ -100,7 +93,7 @@ export default {
...
@@ -100,7 +93,7 @@ export default {
</div>
</div>
<div
<div
:class=
"
{ 'content-loading': group.isChildrenLoading }"
:class=
"
{ 'content-loading': group.isChildrenLoading }"
class="avatar-container
prepend-top-8 prepend-left-5
s24 d-none d-sm-block"
class="avatar-container s24 d-none d-sm-block"
>
>
<a
<a
:href=
"group.relativePath"
:href=
"group.relativePath"
...
@@ -120,32 +113,46 @@ export default {
...
@@ -120,32 +113,46 @@ export default {
</a>
</a>
</div>
</div>
<div
<div
class=
"
title namespace-title
"
class=
"
group-text flex-grow
"
>
>
<a
<div
v-tooltip
class=
"title namespace-title append-right-8"
:href=
"group.relativePath"
:title=
"group.fullName"
class=
"no-expand"
data-placement=
"bottom"
>
{{
// ending bracket must be by closing tag to prevent
// link hover text-decoration from over-extending
group
.
name
}}
</a>
<span
v-if=
"group.permission"
class=
"user-access-role"
>
>
{{
group
.
permission
}}
<a
</span>
v-tooltip
</div>
:href=
"group.relativePath"
<div
:title=
"group.fullName"
v-if=
"group.description"
class=
"no-expand"
class=
"description"
>
data-placement=
"bottom"
<span
v-html=
"group.description"
>
>
{{
</span>
// ending bracket must be by closing tag to prevent
// link hover text-decoration from over-extending
group
.
name
}}
</a>
<span
v-if=
"group.permission"
class=
"user-access-role"
>
{{
group
.
permission
}}
</span>
</div>
<div
v-if=
"group.description"
class=
"description"
>
<span
v-html=
"group.description"
>
</span>
</div>
</div>
</div>
<item-stats
:item=
"group"
class=
"group-stats prepend-top-2"
/>
<item-actions
v-if=
"isGroup"
:group=
"group"
:parent-group=
"parentGroup"
/>
</div>
</div>
<group-folder
<group-folder
v-if=
"group.isOpen && hasChildren"
v-if=
"group.isOpen && hasChildren"
...
...
app/assets/stylesheets/framework/common.scss
View file @
69f0daf7
...
@@ -454,6 +454,7 @@ img.emoji {
...
@@ -454,6 +454,7 @@ img.emoji {
.prepend-left-10
{
margin-left
:
10px
;
}
.prepend-left-10
{
margin-left
:
10px
;
}
.prepend-left-default
{
margin-left
:
$gl-padding
;
}
.prepend-left-default
{
margin-left
:
$gl-padding
;
}
.prepend-left-20
{
margin-left
:
20px
;
}
.prepend-left-20
{
margin-left
:
20px
;
}
.append-right-4
{
margin-right
:
4px
;
}
.append-right-5
{
margin-right
:
5px
;
}
.append-right-5
{
margin-right
:
5px
;
}
.append-right-8
{
margin-right
:
8px
;
}
.append-right-8
{
margin-right
:
8px
;
}
.append-right-10
{
margin-right
:
10px
;
}
.append-right-10
{
margin-right
:
10px
;
}
...
@@ -470,3 +471,5 @@ img.emoji {
...
@@ -470,3 +471,5 @@ img.emoji {
.center
{
text-align
:
center
;
}
.center
{
text-align
:
center
;
}
.vertical-align-middle
{
vertical-align
:
middle
;
}
.vertical-align-middle
{
vertical-align
:
middle
;
}
.flex-align-self-center
{
align-self
:
center
;
}
.flex-align-self-center
{
align-self
:
center
;
}
.flex-grow
{
flex-grow
:
1
;
}
.flex-no-shrink
{
flex-shrink
:
0
;
}
app/assets/stylesheets/pages/groups.scss
View file @
69f0daf7
...
@@ -290,9 +290,8 @@
...
@@ -290,9 +290,8 @@
}
}
.folder-toggle-wrap
{
.folder-toggle-wrap
{
float
:
left
;
line-height
:
$list-text-height
;
font-size
:
0
;
font-size
:
0
;
flex-shrink
:
0
;
span
{
span
{
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
...
@@ -308,7 +307,7 @@
...
@@ -308,7 +307,7 @@
width
:
15px
;
width
:
15px
;
svg
{
svg
{
margin-bottom
:
2
px
;
margin-bottom
:
1
px
;
}
}
}
}
...
@@ -391,9 +390,17 @@
...
@@ -391,9 +390,17 @@
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.avatar-container
>
a
{
.group-text
{
width
:
100%
;
min-width
:
0
;
// allows for truncated text within flex children
text-decoration
:
none
;
}
.avatar-container
{
flex-shrink
:
0
;
>
a
{
width
:
100%
;
text-decoration
:
none
;
}
}
}
&
.has-more-items
{
&
.has-more-items
{
...
@@ -401,9 +408,18 @@
...
@@ -401,9 +408,18 @@
padding
:
20px
10px
;
padding
:
20px
10px
;
}
}
.description
{
p
{
@include
str-truncated
;
max-width
:
none
;
}
}
.stats
{
.stats
{
position
:
relative
;
position
:
relative
;
line-height
:
46px
;
line-height
:
normal
;
flex-shrink
:
0
;
>
span
{
>
span
{
display
:
inline-flex
;
display
:
inline-flex
;
...
@@ -422,14 +438,20 @@
...
@@ -422,14 +438,20 @@
}
}
.controls
{
.controls
{
margin-left
:
5px
;
flex-shrink
:
0
;
>
.btn
{
>
.btn
{
margin
-right
:
$btn-margin-5
;
margin
:
0
0
0
$btn-margin-5
;
}
}
}
}
}
}
@include
media-breakpoint-down
(
xs
)
{
.group-stats
{
display
:
none
;
}
}
.project-row-contents
.stats
{
.project-row-contents
.stats
{
line-height
:
inherit
;
line-height
:
inherit
;
...
@@ -451,18 +473,6 @@
...
@@ -451,18 +473,6 @@
}
}
}
}
ul
.group-list-tree
{
li
.group-row
{
>
.group-row-contents
.title
{
line-height
:
$list-text-height
;
}
&
.has-description
>
.group-row-contents
.title
{
line-height
:
inherit
;
}
}
}
.js-groups-list-holder
{
.js-groups-list-holder
{
.groups-list-loading
{
.groups-list-loading
{
font-size
:
34px
;
font-size
:
34px
;
...
...
changelogs/unreleased/46703-group-dashboard-line-height-is-too-tall-for-group-names.yml
0 → 100644
View file @
69f0daf7
---
title
:
Solves group dashboard line height is too tall for group names.
merge_request
:
21033
author
:
type
:
fixed
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