diff options
| author | Martin Hanzel <mhanzel@gitlab.com> | 2019-06-28 19:34:25 +0200 |
|---|---|---|
| committer | Martin Hanzel <mhanzel@gitlab.com> | 2019-06-28 20:04:43 +0200 |
| commit | 3ac1bf265456aefb9d5c3608ba53bc95b7f1ebfc (patch) | |
| tree | a0482b713cab01dbaa4ab6c604cf0d66d9fa4e49 | |
| parent | 2ae92a18acec0d2f61c9a431bc13b8e708574892 (diff) | |
| download | gitlab-ce-mh/collapsible-boards.tar.gz | |
Fix styles of collapsed milestone/assignee listsmh/collapsible-boards
| -rw-r--r-- | app/assets/javascripts/boards/models/list.js | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/boards.scss | 12 | ||||
| -rw-r--r-- | app/views/shared/boards/components/_board.html.haml | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js index e9786467152..cd553d0c4af 100644 --- a/app/assets/javascripts/boards/models/list.js +++ b/app/assets/javascripts/boards/models/list.js @@ -26,7 +26,8 @@ const TYPES = { isExpandable: false, isBlank: true, }, - default: { // includes label, assignee, and milestone lists + default: { + // includes label, assignee, and milestone lists isPreset: false, isExpandable: true, isBlank: false, diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 478bc1ee94d..343cca96851 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -122,13 +122,23 @@ margin-top: 1px; } + .user-avatar-link, + .milestone-icon { + margin-top: $gl-padding-8; + transform: rotate(90deg); + } + .board-title-text { flex-grow: 0; margin: $gl-padding-8 0; - > span { + .board-title-main-text { display: block; } + + .board-title-sub-text { + display: none; + } } .issue-count-badge { diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml index 4389d4d57e4..fdb2a0a1843 100644 --- a/app/views/shared/boards/components/_board.html.haml +++ b/app/views/shared/boards/components/_board.html.haml @@ -19,7 +19,7 @@ %img.avatar.s20.has-tooltip{ height: "20", width: "20", ":src": "list.assignee.avatar", ":alt": "list.assignee.name" } .board-title-text - %span.has-tooltip.block-truncated{ "v-if": "list.type !== \"label\"", + %span.board-title-main-text.has-tooltip.block-truncated{ "v-if": "list.type !== \"label\"", ":title" => '((list.label && list.label.description) || list.title || "")', data: { container: "body" } } {{ list.title }} |