diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-07 15:32:07 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-11-01 09:15:44 +0000 |
| commit | 6495b8522a0a26e839b24219ee9d18b626facd4c (patch) | |
| tree | 0b3c9b403022483e83f5e8a30a9d5ad04f642f49 /app | |
| parent | 266fcfb1935c8aa8c6ac3d2ae71530c441b08675 (diff) | |
| download | gitlab-ce-6495b8522a0a26e839b24219ee9d18b626facd4c.tar.gz | |
Adds label description to issue board titleissue-boards-list-desciption-tooltip
Closes #22710
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 | 2 | ||||
| -rw-r--r-- | app/views/projects/boards/components/_board.html.haml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 index e520170ef74..db9a5a8e40a 100644 --- a/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 +++ b/app/assets/javascripts/boards/mixins/sortable_default_options.js.es6 @@ -22,7 +22,7 @@ fallbackClass: 'is-dragging', fallbackOnBody: true, ghostClass: 'is-ghost', - filter: '.has-tooltip, .btn', + filter: '.board-delete, .btn', delay: gl.issueBoards.touchEnabled ? 100 : 50, scrollSensitivity: gl.issueBoards.touchEnabled ? 60 : 100, scrollSpeed: 20, diff --git a/app/views/projects/boards/components/_board.html.haml b/app/views/projects/boards/components/_board.html.haml index ba1502c97b6..f7071051efc 100644 --- a/app/views/projects/boards/components/_board.html.haml +++ b/app/views/projects/boards/components/_board.html.haml @@ -11,7 +11,9 @@ .board-inner %header.board-header{ ":class" => "{ 'has-border': list.label }", ":style" => "{ borderTopColor: (list.label ? list.label.color : null) }" } %h3.board-title.js-board-handle{ ":class" => "{ 'user-can-drag': (!disabled && !list.preset) }" } - {{ list.title }} + %span.has-tooltip{ ":title" => "(list.label ? list.label.description : '')", + data: { container: "body", placement: "bottom" } } + {{ list.title }} .board-issue-count-holder.pull-right.clearfix{ "v-if" => "list.type !== 'blank'" } %span.board-issue-count.pull-left{ ":class" => "{ 'has-btn': list.type !== 'done' }" } {{ list.issuesSize }} |