summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFilipa Lacerda <lacerda.filipa@gmail.com>2017-02-21 11:15:03 +0000
committerFilipa Lacerda <lacerda.filipa@gmail.com>2017-02-21 11:15:03 +0000
commit459a97d46812fecc59c973bad356935422c7f60e (patch)
tree48bdab45845d05d42cc17157ae71c67e9a1c1aba /app/assets
parent64b490a8f5a8077cd6026e38519d136f7c404d4c (diff)
parenta308e60757ee0e504ea7c2cacba77c3af1055b13 (diff)
downloadgitlab-ce-459a97d46812fecc59c973bad356935422c7f60e.tar.gz
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
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/pages/todos.scss44
1 files changed, 37 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index 551a66fbf3a..bac831ec315 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -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 {