Răsfoiți Sursa

Fix minicard parents display

Nicu Tofan 7 ani în urmă
părinte
comite
3a4a075dba

+ 13 - 14
client/components/cards/minicard.jade

@@ -7,21 +7,20 @@ template(name="minicard")
         each labels
         each labels
           .minicard-label(class="card-label-{{color}}" title="{{name}}")
           .minicard-label(class="card-label-{{color}}" title="{{name}}")
     .minicard-title
     .minicard-title
+      if $eq 'prefix-with-full-path' currentBoard.presentParentTask
+        .parent-prefix
+          | {{ parentString ' > ' }}
+      if $eq 'prefix-with-parent' currentBoard.presentParentTask
+        .parent-prefix
+          | {{ parentCardName }}
       +viewer
       +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
     .dates
       if receivedAt
       if receivedAt

+ 7 - 0
client/components/cards/minicard.styl

@@ -162,6 +162,13 @@
       margin-bottom: 20px
       margin-bottom: 20px
       overflow-y: auto
       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)
 @media screen and (max-width: 800px)
   .minicard
   .minicard
     .is-selected &
     .is-selected &

+ 1 - 1
i18n/en.i18n.json

@@ -492,7 +492,7 @@
     "prefix-with-full-path": "Prefix with full path",
     "prefix-with-full-path": "Prefix with full path",
     "prefix-with-parent": "Prefix with parent",
     "prefix-with-parent": "Prefix with parent",
     "subtext-with-full-path": "Subtext with full path",
     "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"
     "no-parent": "Don't show parent"
 
 
 }
 }