From 7d0d7019420b9b0ec984d38aa82d39d24f3a95dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Wed, 11 Mar 2020 15:21:53 +0000 Subject: [PATCH 01/15] loop for column colors --- www/kanban/app-kanban.less | 74 +++++++++++--------------------------- 1 file changed, 20 insertions(+), 54 deletions(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 2f6a257bc..852ba3d1a 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -21,14 +21,16 @@ @board-bg: #eaeaea; @palette0: #C9C9C9; // Default bg color for header - @palette1: #FFD4D4; - @palette2: #FFDECA; - @palette3: #FFE69C; - @palette4: #DBFFB7; - @palette5: #AFFDC2; - @palette6: #C9FFFE; - @palette7: #C8D6FF; - @palette8: #E4CAFF; + + @kanban-colors: + #FFD4D4, + #FFDECA, + #FFE69C, + #DBFFB7, + #AFFDC2, + #C9FFFE, + #C8D6FF, + #E4CAFF; .kanban-board-header { background-color: @palette0; @@ -46,54 +48,18 @@ .cp-kanban-palette-nocolor { background-color: @palette0; } - .cp-kanban-palette-color1 { - background-color: @palette1; - &.kanban-board-inner { - background-color: lighten(@palette1, 5%); - } - } - .cp-kanban-palette-color2 { - background-color: @palette2; - &.kanban-board-inner { - background-color: lighten(@palette2, 5%); - } - } - .cp-kanban-palette-color3 { - background-color: @palette3; - &.kanban-board-inner { - background-color: lighten(@palette3, 10%); - } - } - .cp-kanban-palette-color4 { - background-color: @palette4; - &.kanban-board-inner { - background-color: lighten(@palette4, 10%); - } - } - .cp-kanban-palette-color5 { - background-color: @palette5; - &.kanban-board-inner { - background-color: lighten(@palette5, 10%); - } - } - .cp-kanban-palette-color6 { - background-color: @palette6; - &.kanban-board-inner { - background-color: lighten(@palette6, 5%); - } - } - .cp-kanban-palette-color7 { - background-color: @palette7; - &.kanban-board-inner { - background-color: lighten(@palette7, 5%); - } - } - .cp-kanban-palette-color8 { - background-color: @palette8; - &.kanban-board-inner { - background-color: lighten(@palette8, 5%); + + .kanban-colors(@kanban-colors; @index) when (@index > 0){ + .kanban-colors(@kanban-colors; (@index - 1)); + @color: extract(@kanban-colors, @index); + .cp-kanban-palette-color@{index}{ + background-color: @color; + &.kanban-board-inner { + background-color: fade(@color, 50%); + } } } + .kanban-colors(@kanban-colors; length(@kanban-colors)); .cp-kanban-edit-modal { display: flex; From 5cc0161e45b2f308366df237def844c81f63cc5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Wed, 11 Mar 2020 15:30:05 +0000 Subject: [PATCH 02/15] fade [+] button in column footers --- www/kanban/app-kanban.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 852ba3d1a..70e1c40ab 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -234,7 +234,8 @@ .tools_unselectable(); outline: none; width: 100%; - border: 1px solid @cryptpad_text_col; + border: 1px solid fade(@cryptpad_text_col, 70%); + color: fade(@cryptpad_text_col, 70%); border-radius: 0px; font-size: 40px; display: inline-flex; From 6347b6193b0dea834de5b19c66c351c08cc913a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Wed, 11 Mar 2020 16:17:27 +0000 Subject: [PATCH 03/15] align edit button to the top --- www/kanban/app-kanban.less | 1 + 1 file changed, 1 insertion(+) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 70e1c40ab..c00257f72 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -127,6 +127,7 @@ .kanban-edit-item { padding: 5px; + align-self: flex-start; } .cp-kanban-cursors { From 1d0e9f7392158ffe454681bc80d8d0d976b462db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Wed, 11 Mar 2020 16:18:04 +0000 Subject: [PATCH 04/15] adjustments to card body rendered markdown --- www/kanban/app-kanban.less | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index c00257f72..915b23a32 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -50,8 +50,10 @@ } .kanban-colors(@kanban-colors; @index) when (@index > 0){ + // loop through the @colors .kanban-colors(@kanban-colors; (@index - 1)); @color: extract(@kanban-colors, @index); + // make a numbered class selector for each color .cp-kanban-palette-color@{index}{ background-color: @color; &.kanban-board-inner { @@ -59,6 +61,7 @@ } } } + // call the loop .kanban-colors(@kanban-colors; length(@kanban-colors)); .cp-kanban-edit-modal { @@ -168,8 +171,25 @@ .markdown_cryptpad(); .markdown_preformatted-code; .markdown_gfm-table(black); + p { + margin-bottom: 5px; + } ul { - padding-left: 30px; + padding-left: 20px; + } + img { + max-width: 100%; + } + table { + color: @cryptpad_text_col; + border-color: @cryptpad_text_col; + th { + padding: 5px !important; + background-color: fade(@cryptpad_text_col, 10%); + } + td { + padding: 5px; + } } } .kanban-item-tags { From 928fe6c3dc69a1f5b9c52ddcf3a6471f17218d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Wed, 11 Mar 2020 16:38:34 +0000 Subject: [PATCH 05/15] change trash color --- www/kanban/app-kanban.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 915b23a32..828b316ca 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -404,9 +404,9 @@ right: 0; } &.kanban-trash-active { - color: red; + color: @colortheme_notification-warn; div { - background: rgba(255,0,0,0.5); + background: fade(@colortheme_notification-warn, 20%); } } .kanban-item, .kanban-board { From 291a84723faf46a0474433e42b059b0a3f547dd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Wed, 11 Mar 2020 16:57:57 +0000 Subject: [PATCH 06/15] display cursors inline in modal notification. --- www/kanban/app-kanban.less | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 828b316ca..dc085fbe1 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -74,8 +74,12 @@ background: #eee; color: @cryptpad_text_col; font-size: 14px; + div { + display: inline; + } .cp-kanban-cursors { - margin-top: 5px; + display: inline; + margin-left: 5px; } margin-bottom: 5px; } From f38caa0af57c92f619ab5ed5d07ba3fb4a31f7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Thu, 12 Mar 2020 14:43:10 +0000 Subject: [PATCH 07/15] move tag filter clear and add text --- www/kanban/app-kanban.less | 5 ++++- www/kanban/inner.js | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index dc085fbe1..190b4feb3 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -290,9 +290,12 @@ max-width: 80%; min-width: 150px; - &> i { + .cp-kanban-filterTags-reset { cursor: pointer; margin-left: 10px; + i { + margin-right: 5px; + } } .cp-kanban-filterTags-name { flex-shrink: 0; diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 1efcec034..095ea22b6 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -795,11 +795,11 @@ define([ // Tags filter var existing = getExistingTags(kanban.options.boards); var list = h('div.cp-kanban-filterTags-list'); - var reset = h('i.cp-kanban-filterTags-reset.fa.fa-times'); + var reset = h('span.cp-kanban-filterTags-reset', [h('i.fa.fa-times'), 'clear filter']); //XXX key var tags = h('div.cp-kanban-filterTags', [ h('span.cp-kanban-filterTags-name', Messages.kanban_tags), - reset, - list + list, + reset ]); var $reset = $(reset); var $list = $(list); From a5767d8b6805f6a19a9f387779360066164d50cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Thu, 12 Mar 2020 15:01:30 +0000 Subject: [PATCH 08/15] fix hover color of markdown toolbar buttons --- www/kanban/app-kanban.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 190b4feb3..8ff066381 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -95,6 +95,12 @@ .cp-markdown-toolbar { background-color: #eee; color: @cryptpad_text_col; + button { + &:hover { + background-color: @cryptpad_text_col; + color: white; + } + } } margin-bottom: 15px; } From cd5c9739adda1f079eb2d65e433fa1c98e9d8948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Thu, 12 Mar 2020 15:05:12 +0000 Subject: [PATCH 09/15] move temp translation key --- www/kanban/inner.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 095ea22b6..03316c621 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -64,6 +64,7 @@ define([ Messages.kanban_tags = "Filter tags"; // XXX Messages.kanban_noTags = "No tags"; // XXX Messages.kanban_conflicts = "Currently editing:"; // XXX + Messages.kanban_clearFilter = "clear filter" // XXX // XXX // Conflicts @@ -795,7 +796,7 @@ define([ // Tags filter var existing = getExistingTags(kanban.options.boards); var list = h('div.cp-kanban-filterTags-list'); - var reset = h('span.cp-kanban-filterTags-reset', [h('i.fa.fa-times'), 'clear filter']); //XXX key + var reset = h('span.cp-kanban-filterTags-reset', [h('i.fa.fa-times'), Messages.kanban_clearFilter]); var tags = h('div.cp-kanban-filterTags', [ h('span.cp-kanban-filterTags-name', Messages.kanban_tags), list, From a442f7785100a1ce8c9ec75d52544924f2c8df99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Thu, 12 Mar 2020 15:28:26 +0000 Subject: [PATCH 10/15] style code blocks --- www/kanban/app-kanban.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 8ff066381..bf1386017 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -190,6 +190,12 @@ img { max-width: 100%; } + pre > code { + border: none; + padding: 5px; + margin: 0; + background-color: @cryptpad_color_light_grey; + } table { color: @cryptpad_text_col; border-color: @cryptpad_text_col; From e17544d168907113b9898964ce0e4d8f1cf13026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Thu, 12 Mar 2020 15:30:47 +0000 Subject: [PATCH 11/15] add code block width --- www/kanban/app-kanban.less | 1 + www/kanban/inner.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index bf1386017..fa9df9b3b 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -195,6 +195,7 @@ padding: 5px; margin: 0; background-color: @cryptpad_color_light_grey; + width: 100%; } table { color: @cryptpad_text_col; diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 03316c621..4415bdf32 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -64,7 +64,7 @@ define([ Messages.kanban_tags = "Filter tags"; // XXX Messages.kanban_noTags = "No tags"; // XXX Messages.kanban_conflicts = "Currently editing:"; // XXX - Messages.kanban_clearFilter = "clear filter" // XXX + Messages.kanban_clearFilter = "clear filter"; // XXX // XXX // Conflicts From 7bb0263f8f94c06dbac8d3627fa164269ddddded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Thu, 12 Mar 2020 17:01:38 +0000 Subject: [PATCH 12/15] make tag input 100% width --- www/kanban/app-kanban.less | 1 + 1 file changed, 1 insertion(+) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index fa9df9b3b..1aa4cba5c 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -120,6 +120,7 @@ #cp-kanban-edit-tags { .tokenfield { margin: 0; + width: 100%; } margin-bottom: 15px; } From fcb67d5b50ce7ec07b162b294214251868293ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Fri, 13 Mar 2020 08:53:29 +0000 Subject: [PATCH 13/15] add alt text to edit card/board buttons --- www/kanban/inner.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 4415bdf32..0d07b78cd 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -65,6 +65,8 @@ define([ Messages.kanban_noTags = "No tags"; // XXX Messages.kanban_conflicts = "Currently editing:"; // XXX Messages.kanban_clearFilter = "clear filter"; // XXX + Messages.kanban_editCard = "edit this card" // XXX + Messages.kanban_editBoard = "edit this board" // XXX // XXX // Conflicts @@ -448,6 +450,7 @@ define([ var itemId = $(el).attr('data-eid'); $('