BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
459a97d4
Commit
459a97d4
authored
Feb 21, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
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
parents
64b490a8
a308e607
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
13 deletions
+52
-13
todos.scss
app/assets/stylesheets/pages/todos.scss
+37
-7
_todo.html.haml
app/views/dashboard/todos/_todo.html.haml
+11
-6
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 @
459a97d4
...
...
@@ -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
{
...
...
app/views/dashboard/todos/_todo.html.haml
View file @
459a97d4
%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
...
...
changelogs/unreleased/28186-long-group-names-overflow-out-of-todos-view.yml
0 → 100644
View file @
459a97d4
---
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