From 2f67beff1c6853283c00961427fca5674435d2b1 Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Tue, 24 Oct 2023 15:28:16 +0200 Subject: [PATCH 1/7] changed positioning of kanban tag container on smaller screen widths --- www/kanban/app-kanban.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 9e1a80ac5..b3f37bbef 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -426,7 +426,9 @@ position: relative; min-height: 50px; .cp-kanban-filterTags { - display: inline-flex; + @media (min-width: 505px) { + display: inline-flex; + } align-items: center; flex: 1; //max-width: 80%; @@ -434,6 +436,9 @@ .cp-kanban-filterTags-toggle { min-width: 100px; display: flex; + @media (max-width: 505px) { + margin-left: 10px; + } flex-flow: column; flex-shrink: 0; & > * { From f82b68438f4fbf9f1ab788233011a0462aecf7e0 Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Mon, 27 Nov 2023 12:56:24 +0100 Subject: [PATCH 2/7] added margin to 'clear filter' button in mobile view #1103 --- www/kanban/app-kanban.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 6a7032c21..539d45535 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -462,6 +462,10 @@ button.cp-kanban-filterTags-reset { cursor: pointer; white-space: normal !important; + @media (max-width: 505px) { + margin-bottom: 10px; + margin-right: 10px; + } .tools_unselectable(); i { margin-right: 5px; From 0cf4237423de3528e199edd8f5918f7cf1fe6d68 Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Mon, 4 Dec 2023 23:12:21 +0100 Subject: [PATCH 3/7] see less/more tag button on mobile --- www/kanban/app-kanban.less | 8 +++++++- www/kanban/inner.js | 42 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 539d45535..70dd7facf 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -164,7 +164,10 @@ } margin-bottom: 15px; } - + .kanban-tag-btn-toggle { + margin-top: 10px; + margin-left: 10px + } #cp-app-kanban-container { flex: 1; display: flex; @@ -474,6 +477,9 @@ .cp-kanban-filterTags-list { margin-right: 10px; margin-left: 10px; + @media (max-width: 405px) { + padding-top: 15px + } display: flex; flex-wrap: wrap; &:not(.cp-empty) { diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 22db72ca4..9a7ce2654 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -56,6 +56,9 @@ define([ jKanban, Export) { + Messages.kanban_showTags = 'See all tags'; //XX + Messages.kanban_hideTags = 'See less tags'; //XX + var verbose = function (x) { console.log(x); }; verbose = function () {}; // comment out to enable verbose logging var onRedraw = Util.mkEvent(); @@ -937,6 +940,8 @@ define([ //framework._.sfCommon.setPadAttribute('quickMode', false); }); + var toggleTagsButton = h('button.btn.kanban-tag-btn-toggle', Messages.kanban_showTags); + // Tags filter var existing = getExistingTags(kanban.options.boards); var list = h('div.cp-kanban-filterTags-list'); @@ -946,12 +951,14 @@ define([ ]); var hint = h('span.cp-kanban-filterTags-name', Messages.kanban_tags); var tags = h('div.cp-kanban-filterTags', [ + h('span.cp-kanban-filterTags-toggle', [ hint, reset, ]), list, ]); + var $reset = $(reset); var $list = $(list); var $hint = $(hint); @@ -967,6 +974,7 @@ define([ return String($(this).data('tag')); }).get(); }; + var commitTags = function () { var t = getTags(); setTagFilterState(t.length); @@ -1024,6 +1032,40 @@ define([ commitTags(); }); + + if ($(window).width() < 500) { + + $(tags).append(toggleTagsButton); + + var hideTags = function () { + for (var tag of list.children) { + if (existing.indexOf(tag.innerHTML) > 10) { + $(tag).hide(); + } + } + }; + hideTags(); + + var toggleTags = function () { + for (var tag of list.children) { + if (existing.indexOf(tag.innerHTML) > 10 && kanban.options.tags.indexOf(tag.innerHTML) === -1) { + if ($(tag).is(":visible")) { + $(tag).hide(); + $(toggleTagsButton).html(Messages.kanban_showTags); + } else { + $(tag).show(); + $(toggleTagsButton).html(Messages.kanban_hideTags); + } + } + } + }; + + $(toggleTagsButton).click(function() { + toggleTags(); + }); + + } + var container = h('div#cp-kanban-controls', [ tags, h('div.cp-kanban-changeView', [ From fe656c16a30e27cf180753502e2a7326fcddae88 Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Tue, 5 Dec 2023 11:38:59 +0100 Subject: [PATCH 4/7] changed button class --- www/kanban/inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 9a7ce2654..8b41e9fa6 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -940,7 +940,7 @@ define([ //framework._.sfCommon.setPadAttribute('quickMode', false); }); - var toggleTagsButton = h('button.btn.kanban-tag-btn-toggle', Messages.kanban_showTags); + var toggleTagsButton = h('button.btn.btn-default.kanban-tag-btn-toggle', Messages.kanban_showTags); // Tags filter var existing = getExistingTags(kanban.options.boards); From 3d17cbfac42659d44e257d4a290f482375e5562f Mon Sep 17 00:00:00 2001 From: zuzanna-maria Date: Fri, 8 Dec 2023 22:23:39 +0100 Subject: [PATCH 5/7] changed html() to text() in button function --- www/kanban/inner.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 8b41e9fa6..2a3bd4ae9 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -1051,10 +1051,10 @@ define([ if (existing.indexOf(tag.innerHTML) > 10 && kanban.options.tags.indexOf(tag.innerHTML) === -1) { if ($(tag).is(":visible")) { $(tag).hide(); - $(toggleTagsButton).html(Messages.kanban_showTags); + $(toggleTagsButton).text(Messages.kanban_showTags); } else { $(tag).show(); - $(toggleTagsButton).html(Messages.kanban_hideTags); + $(toggleTagsButton).text(Messages.kanban_hideTags); } } } From 906cd1cb15495ce72fe17571522c967f0583884f Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 13 Dec 2023 14:59:38 +0100 Subject: [PATCH 6/7] Fix margin issues with kanban tags --- www/kanban/app-kanban.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less index 70dd7facf..8d50f1e91 100644 --- a/www/kanban/app-kanban.less +++ b/www/kanban/app-kanban.less @@ -437,6 +437,9 @@ .cp-kanban-filterTags { @media (min-width: 505px) { display: inline-flex; + .kanban-tag-btn-toggle { + margin-right: 10px; + } } align-items: center; flex: 1; @@ -477,9 +480,6 @@ .cp-kanban-filterTags-list { margin-right: 10px; margin-left: 10px; - @media (max-width: 405px) { - padding-top: 15px - } display: flex; flex-wrap: wrap; &:not(.cp-empty) { From 0fb82aa688e7e14f0da970ac22b0d47b73b171d6 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 13 Dec 2023 15:02:28 +0100 Subject: [PATCH 7/7] Fix XXX comment --- www/kanban/inner.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/kanban/inner.js b/www/kanban/inner.js index 2a3bd4ae9..5df509f81 100644 --- a/www/kanban/inner.js +++ b/www/kanban/inner.js @@ -56,8 +56,8 @@ define([ jKanban, Export) { - Messages.kanban_showTags = 'See all tags'; //XX - Messages.kanban_hideTags = 'See less tags'; //XX + Messages.kanban_showTags = 'See all tags'; // XXX + Messages.kanban_hideTags = 'See less tags'; // XXX var verbose = function (x) { console.log(x); }; verbose = function () {}; // comment out to enable verbose logging