Merge branch '28186-long-group-names-overflow-out-of-todos-view' into 'master'

Truncate long title text on Todo items

Closes #28186

See merge request !9311
This commit is contained in:
Filipa Lacerda 2017-02-21 11:15:03 +00:00
commit 459a97d468
3 changed files with 52 additions and 13 deletions

View File

@ -43,6 +43,12 @@
}
}
.todo-avatar,
.todo-actions {
-webkit-flex: 0 0 auto;
flex: 0 0 auto;
}
.todo-actions {
display: -webkit-flex;
display: flex;
@ -55,8 +61,9 @@
}
.todo-item {
-webkit-flex: auto;
flex: auto;
-webkit-flex: 0 1 100%;
flex: 0 1 100%;
min-width: 0;
}
}
@ -74,8 +81,29 @@
.todo-item {
.todo-title {
@include str-truncated(calc(100% - 174px));
overflow: visible;
display: flex;
& > .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 {
@ -154,10 +182,12 @@
.todo-item {
.todo-title {
white-space: normal;
overflow: visible;
max-width: 100%;
flex-flow: row wrap;
margin-bottom: 10px;
.todo-label {
white-space: normal;
}
}
.todo-body {

View File

@ -1,28 +1,33 @@
%li{ class: "todo todo-#{todo.done? ? 'done' : 'pending'}", id: dom_id(todo), data: { url: todo_target_path(todo) } }
= author_avatar(todo, size: 40)
.todo-avatar
= author_avatar(todo, size: 40)
.todo-item.todo-block
.todo-title.title
- unless todo.build_failed? || todo.unmergeable?
= todo_target_state_pill(todo)
%span.author-name
.title-item.author-name
- if todo.author
= link_to_author(todo)
- else
(removed)
%span.action-name
.title-item.action-name
= todo_action_name(todo)
%span.todo-label
.title-item.todo-label
- if todo.target
= todo_target_link(todo)
- else
(removed)
· #{time_ago_with_tooltip(todo.created_at)}
= todo_due_date(todo)
.title-item
·
.title-item
#{time_ago_with_tooltip(todo.created_at)}
= todo_due_date(todo)
.todo-body
.todo-note

View File

@ -0,0 +1,4 @@
---
title: Truncate long Todo titles for non-mobile screens
merge_request: 9311
author: