From 3a4a075dbadba8c1ce12fa86730a4507985729f7 Mon Sep 17 00:00:00 2001 From: Nicu Tofan Date: Tue, 26 Jun 2018 13:22:51 +0300 Subject: Fix minicard parents display --- client/components/cards/minicard.jade | 27 +++++++++++++-------------- client/components/cards/minicard.styl | 7 +++++++ i18n/en.i18n.json | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 9a9b897f..57913669 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -7,21 +7,20 @@ template(name="minicard") each labels .minicard-label(class="card-label-{{color}}" title="{{name}}") .minicard-title + if $eq 'prefix-with-full-path' currentBoard.presentParentTask + .parent-prefix + | {{ parentString ' > ' }} + if $eq 'prefix-with-parent' currentBoard.presentParentTask + .parent-prefix + | {{ parentCardName }} +viewer - if isTopLevel - = title - else - if $eq 'prefix-with-full-path' currentBoard.presentParentTask - [{{ parentString ' > ' }}] {{ title }} - else - if $eq 'prefix-with-parent' currentBoard.presentParentTask - [{{ parentCardName }}] {{ title }} - else - = title - if $eq 'subtext-with-full-path' currentBoard.presentParentTask - .small {{ parentString ' > ' }} - if $eq 'subtext-with-parent' currentBoard.presentParentTask - .small {{ parentCardName }} + {{ title }} + if $eq 'subtext-with-full-path' currentBoard.presentParentTask + .parent-subtext + | {{ parentString ' > ' }} + if $eq 'subtext-with-parent' currentBoard.presentParentTask + .parent-subtext + | {{ parentCardName }} .dates if receivedAt diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 38f829d0..6c9414a7 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -162,6 +162,13 @@ margin-bottom: 20px overflow-y: auto +.parent-prefix + color: darken(white, 30%) + font-size: 0.9em +.parent-subtext + color: darken(white, 30%) + font-size: 0.9em + @media screen and (max-width: 800px) .minicard .is-selected & diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index ed2c45af..e89d6928 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -492,7 +492,7 @@ "prefix-with-full-path": "Prefix with full path", "prefix-with-parent": "Prefix with parent", "subtext-with-full-path": "Subtext with full path", - "subtext-with-parent": "Subtext with full parent", + "subtext-with-parent": "Subtext with parent", "no-parent": "Don't show parent" } -- cgit v1.2.3-1-g7c22