From 3e1a2b565eb3620e19af92e1cdcc994cd825b8fd Mon Sep 17 00:00:00 2001 From: liugang Date: Fri, 22 Jun 2018 13:15:56 +0800 Subject: [PATCH] * Finish task #4482 --- module/project/css/kanban.css | 5 +++-- module/project/css/storykanban.css | 3 ++- module/project/js/kanban.js | 9 +++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/module/project/css/kanban.css b/module/project/css/kanban.css index 8720efa57d..3ecf0b2502 100644 --- a/module/project/css/kanban.css +++ b/module/project/css/kanban.css @@ -1,9 +1,10 @@ .boards {display: table; table-layout: fixed; width: auto; } +.boards .board:not(:last-child) {border-right: 1px solid #ddd;} .board {display: table-cell; width: 16.666666667%; padding: 10px; border: 1px solid transparent; transition: background-color .2s, opacity .2s; vertical-align: top;} .board-item {border: 1px solid #EBEBEB; padding: 5px 10px; cursor: move; border-radius: 2px; background-color: #fff; transition: border .2s, opacity .2s; overflow: hidden;} .board-item.disabled {cursor: not-allowed;} .board-item:hover {border-color: #ccc;} -.board-item > .title {line-height: 20px; max-height: 40px; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis;} +.board-item > .title {line-height: 20px; max-height: 40px; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; word-break: break-all;} .board-item > .info {line-height: 22px; margin-top: 6px;} .board-item + .board-item {margin-top: 10px;} .board-item .task-left {float: right; font-size: 12px; color: #a6aab8;} @@ -37,4 +38,4 @@ #kanban .fix-table-copy-wrapper {overflow: visible!important;} #kanban .fix-table-copy-wrapper th.c-board {color: #eee;} #kanban .fix-table-copy-wrapper th.c-board .btn-link {color: #fff;} -#kanban .group-title {word-break: break-all; line-height: 16px; padding: 3px 0; display: block;} \ No newline at end of file +#kanban .group-title {word-break: break-all; line-height: 16px; padding: 3px 0; display: block;} diff --git a/module/project/css/storykanban.css b/module/project/css/storykanban.css index 3565f17f59..5466453efa 100644 --- a/module/project/css/storykanban.css +++ b/module/project/css/storykanban.css @@ -1,9 +1,10 @@ .boards {display: table; table-layout: fixed; width: auto; } +.boards .board:not(:last-child) {border-right: 1px solid #ddd;} .board {display: table-cell; width: 16.666666667%; padding: 10px; border: 1px solid transparent; transition: background-color .2s, opacity .2s; vertical-align: top;} .board-item {border: 1px solid #EBEBEB; padding: 5px 10px; cursor: move; border-radius: 2px; background-color: #fff; transition: border .2s, opacity .2s; overflow: hidden;} .board-item.disabled {cursor: not-allowed;} .board-item:hover {border-color: #ccc;} -.board-item > .title {line-height: 20px; max-height: 40px; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis;} +.board-item > .title {line-height: 20px; max-height: 40px; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; word-break: break-all;} .board-item > .info {line-height: 22px; margin-top: 6px;} .board-item + .board-item {margin-top: 10px;} .board-item .task-left {float: right; font-size: 12px; color: #a6aab8;} diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js index cc7ce500c0..01057745c7 100644 --- a/module/project/js/kanban.js +++ b/module/project/js/kanban.js @@ -1,5 +1,14 @@ $(function() { + $('.c-boards').each(function() + { + var $boardsWrapper = $(this).find('.boards-wrapper'); + if($boardsWrapper.height() < $(this).height()) + { + $boardsWrapper.find('.boards').css('height', $(this).height()); + } + }); + var boardID = ''; var onlybody = config.requestType == 'GET' ? "&onlybody=yes" : "?onlybody=yes"; $.cookie('selfClose', 0, {expires:config.cookieLife, path:config.webRoot});