3 files changed, 48 insertions, 26 deletions

diff --git a/templates/partials/gallery_card.html b/templates/partials/gallery_card.html
index e319fa4..f040952 100644
--- a/templates/partials/gallery_card.html
+++ b/templates/partials/gallery_card.html
@@ -1,4 +1,3 @@
-$if(it.url)$
 $if(it.thumbnail)$
 <a
     href="$it.url.rel$"
@@ -29,27 +28,39 @@ $if(it.thumbnail)$
                 <use href="$assets.icons_svg$#$it.icon$"></use>
             </svg>
         $endif$
+        $if(it.draft)$
+            <div class="l-media__block">
+                <span class="o-badge">Draft</span>
+            </div>
+        $endif$
         <div class="l-media__block l-media__block--main">
-            $if(it.draft)$
-                <strong class="u-d-block">$it.title$</strong>
-                <div><span class="o-badge">Draft</span></div>
-            $elseif(it.subtitle)$
-                <strong class="u-d-block">$it.title$</strong>
+            $if(it.subtitle)$
+                <div>
+                    <strong>$it.title$</strong>
+                    $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
+                </div>
                 <small class="u-d-block">$it.subtitle$</small>
             $elseif(it.category)$
                 <small class="u-d-block">$it.category$</small>
-                <strong class="u-d-block">$it.title$</strong>
+                <div>
+                    <strong>$it.title$</strong>
+                    $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
+                </div>
             $elseif(it.show_date)$
                 <small class="u-d-block">
                     <time datetime="$it.last_update.yyyy_mm_dd$" itemprop="dateCreated">
                         $it.last_update.long$
                     </time>
                 </small>
-                <strong class="u-d-block">$it.title$</strong>
+                <div>
+                    <strong>$it.title$</strong>
+                    $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
+                </div>
             $else$
                 <span class="p-name" itemprop="name headline">
                     $it.title$
                 </span>
+                $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
             $endif$
         </div>
         $if(it.post_icon)$
@@ -60,4 +71,3 @@ $if(it.thumbnail)$
     </div>
 </a>
 $endif$
-$endif$
diff --git a/templates/partials/grid_card.html b/templates/partials/grid_card.html
index 8b65320..ab6dbbc 100644
--- a/templates/partials/grid_card.html
+++ b/templates/partials/grid_card.html
@@ -1,4 +1,3 @@
-$if(it.url)$
 <a
     href="$it.url.rel$"
     class="l-card-list__card c-card h-entry"
@@ -17,26 +16,33 @@ $if(it.url)$
             </svg>
         $endif$
         <div class="l-media__block l-media__block--main">
-            $if(it.draft)$
-                <strong class="u-d-block">$it.title$</strong>
-                <div><span class="o-badge">Draft</span></div>
-            $elseif(it.subtitle)$
-                <strong class="u-d-block">$it.title$</strong>
+            $if(it.subtitle)$
+                <div>
+                    <strong>$it.title$</strong>
+                    $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
+                </div>
                 <small class="u-d-block">$it.subtitle$</small>
             $elseif(it.category)$
                 <small class="u-d-block">$it.category$</small>
-                <strong class="u-d-block">$it.title$</strong>
+                <div>
+                    <strong>$it.title$</strong>
+                    $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
+                </div>
             $elseif(it.show_date)$
                 <small class="u-d-block">
                     <time datetime="$it.last_update.yyyy_mm_dd$" itemprop="dateCreated">
                         $it.last_update.long$
                     </time>
                 </small>
-                <strong class="u-d-block">$it.title$</strong>
+                <div>
+                    <strong>$it.title$</strong>
+                    $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
+                </div>
             $else$
                 <span class="p-name" itemprop="name headline">
                     $it.title$
                 </span>
+                $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
             $endif$
         </div>
         $if(it.post_icon)$
@@ -46,4 +52,3 @@ $if(it.url)$
         $endif$
     </div>
 </a>
-$endif$
diff --git a/templates/partials/list_card.html b/templates/partials/list_card.html
index 0695eed..a89193a 100644
--- a/templates/partials/list_card.html
+++ b/templates/partials/list_card.html
@@ -1,4 +1,3 @@
-$if(it.url)$
 <a
     href="$it.url.rel$"
     class="l-card-list__card c-card h-entry"
@@ -19,27 +18,36 @@ $if(it.url)$
         <div class="l-media__block l-media__block--main u-d-none@sm-hi">
             $if(it.subtitle)$
                 <small class="u-d-block">$it.subtitle$</small>
-                <strong class="u-d-block">$it.title$</strong>
+                <div>
+                    <strong>$it.title$</strong>
+                    $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
+                </div>
             $elseif(it.category)$
                 <small class="u-d-block">$it.category$</small>
-                <strong class="u-d-block">$it.title$</strong>
+                <div>
+                    <strong>$it.title$</strong>
+                    $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
+                </div>
             $elseif(it.last_update)$
                 <small>
                     <time datetime="$it.last_update.yyyy_mm_dd$">$it.last_update.long$</time>
                 </small>
-                <strong class="u-d-block">$it.title$</strong>
+                <div>
+                    <strong>$it.title$</strong>
+                    $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
+                </div>
             $else$
                 <span class="p-name" itemprop="name headline">
                     $it.title$
                 </span>
+                $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
             $endif$
         </div> 
         <div class="l-media__block l-media__block--main u-d-none@sm-lo">
             $it.title$
+            $if(it.draft)$<span class="o-badge u-ml-100">Draft</span>$endif$
         </div>
-        $if(it.draft)$
-            <div class="l-media__block u-d-none@sm-lo"><span class="o-badge">Draft</span></div>
-        $elseif(it.subtitle)$
+        $if(it.subtitle)$
             <small class="l-media__block u-d-none@sm-lo">$it.subtitle$</small>
         $elseif(it.category)$
             <small class="l-media__block u-d-none@sm-lo">$it.category$</small>
@@ -57,4 +65,3 @@ $if(it.url)$
         $endif$
     </div>
 </a>
-$endif$