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
a308e607
Commit
a308e607
authored
Feb 20, 2017
by
Sam Rose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Truncate long title text on Todo items
parent
12cd4c83
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
13 deletions
+52
-13
app/assets/stylesheets/pages/todos.scss
app/assets/stylesheets/pages/todos.scss
+37
-7
app/views/dashboard/todos/_todo.html.haml
app/views/dashboard/todos/_todo.html.haml
+11
-6
changelogs/unreleased/28186-long-group-names-overflow-out-of-todos-view.yml
...sed/28186-long-group-names-overflow-out-of-todos-view.yml
+4
-0
No files found.
app/assets/stylesheets/pages/todos.scss
View file @
a308e607
...
@@ -43,6 +43,12 @@
...
@@ -43,6 +43,12 @@
}
}
}
}
.todo-avatar
,
.todo-actions
{
-webkit-flex
:
0
0
auto
;
flex
:
0
0
auto
;
}
.todo-actions
{
.todo-actions
{
display
:
-
webkit-flex
;
display
:
-
webkit-flex
;
display
:
flex
;
display
:
flex
;
...
@@ -55,8 +61,9 @@
...
@@ -55,8 +61,9 @@
}
}
.todo-item
{
.todo-item
{
-webkit-flex
:
auto
;
-webkit-flex
:
0
1
100%
;
flex
:
auto
;
flex
:
0
1
100%
;
min-width
:
0
;
}
}
}
}
...
@@ -74,8 +81,29 @@
...
@@ -74,8 +81,29 @@
.todo-item
{
.todo-item
{
.todo-title
{
.todo-title
{
@include
str-truncated
(
calc
(
100%
-
174px
));
display
:
flex
;
overflow
:
visible
;
&
>
.title-item
{
-webkit-flex
:
0
0
auto
;
flex
:
0
0
auto
;
margin
:
0
2px
;
&
:first-child
{
margin-left
:
0
;
}
&
:last-child
{
margin-right
:
0
;
}
}
.todo-label
{
-webkit-flex
:
0
1
auto
;
flex
:
0
1
auto
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
}
}
.status-box
{
.status-box
{
...
@@ -154,10 +182,12 @@
...
@@ -154,10 +182,12 @@
.todo-item
{
.todo-item
{
.todo-title
{
.todo-title
{
white-space
:
normal
;
flex-flow
:
row
wrap
;
overflow
:
visible
;
max-width
:
100%
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
.todo-label
{
white-space
:
normal
;
}
}
}
.todo-body
{
.todo-body
{
...
...
app/views/dashboard/todos/_todo.html.haml
View file @
a308e607
%li
{
class:
"todo todo-#{todo.done? ? 'done' : 'pending'}"
,
id:
dom_id
(
todo
),
data:
{
url:
todo_target_path
(
todo
)
}
}
%li
{
class:
"todo todo-#{todo.done? ? 'done' : 'pending'}"
,
id:
dom_id
(
todo
),
data:
{
url:
todo_target_path
(
todo
)
}
}
.todo-avatar
=
author_avatar
(
todo
,
size:
40
)
=
author_avatar
(
todo
,
size:
40
)
.todo-item.todo-block
.todo-item.todo-block
...
@@ -6,22 +7,26 @@
...
@@ -6,22 +7,26 @@
-
unless
todo
.
build_failed?
||
todo
.
unmergeable?
-
unless
todo
.
build_failed?
||
todo
.
unmergeable?
=
todo_target_state_pill
(
todo
)
=
todo_target_state_pill
(
todo
)
%span
.author-name
.title-item
.author-name
-
if
todo
.
author
-
if
todo
.
author
=
link_to_author
(
todo
)
=
link_to_author
(
todo
)
-
else
-
else
(removed)
(removed)
%span
.action-name
.title-item
.action-name
=
todo_action_name
(
todo
)
=
todo_action_name
(
todo
)
%span
.todo-label
.title-item
.todo-label
-
if
todo
.
target
-
if
todo
.
target
=
todo_target_link
(
todo
)
=
todo_target_link
(
todo
)
-
else
-
else
(removed)
(removed)
·
#{
time_ago_with_tooltip
(
todo
.
created_at
)
}
.title-item
·
.title-item
#{
time_ago_with_tooltip
(
todo
.
created_at
)
}
=
todo_due_date
(
todo
)
=
todo_due_date
(
todo
)
.todo-body
.todo-body
...
...
changelogs/unreleased/28186-long-group-names-overflow-out-of-todos-view.yml
0 → 100644
View file @
a308e607
---
title
:
Truncate long Todo titles for non-mobile screens
merge_request
:
9311
author
:
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