4 files changed, 35 insertions, 32 deletions

diff --git a/assets/css/layouts/_card-list.scss b/assets/css/layouts/_card-list.scss
index d8f5df1..d983f8d 100644
--- a/assets/css/layouts/_card-list.scss
+++ b/assets/css/layouts/_card-list.scss
@@ -28,7 +28,7 @@
 
     @include iro.bem-layout(iro.props-namespace()) {
         margin-top: fn.dim(--margin-top);
-        font-size:  1rem;
+        font-size:  fn.global-dim(--font-size --100);
 
         @include iro.bem-elem('header') {
             margin-top: fn.dim(--margin-top);
diff --git a/templates/partials/gallery_card.html b/templates/partials/gallery_card.html
index 4fe40a7..deffb3f 100644
--- a/templates/partials/gallery_card.html
+++ b/templates/partials/gallery_card.html
@@ -31,21 +31,18 @@ $if(it.thumbnail)$
         $endif$
         <div class="l-media__block l-media__block--main">
             $if(it.subtitle)$
-                <strong class="u-d-block u-elp" itemprop="name headline">$it.title$</strong>
-                <small class="u-d-block u-elp p-name">$it.subtitle$</small>
+                <strong class="u-d-block u-elp">$it.title$</strong>
+                <small class="u-d-block u-elp">$it.subtitle$</small>
             $elseif(it.category)$
                 <small class="u-d-block u-elp">$it.category$</small>
-                <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong>
+                <strong class="u-d-block u-elp">$it.title$</strong>
             $elseif(it.date)$
                 <time datetime="$it.date.yyyy_mm_dd$" itemprop="dateCreated">
-                    <small class="u-d-none@sm-hi">
-                        $it.date.short$
-                    </small>
-                    <small class="u-d-none@sm-lo">
+                    <small>
                         $it.date.long$
                     </small>
                 </time>
-                <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong>
+                <strong class="u-d-block u-elp">$it.title$</strong>
             $else$
                 <span class="p-name" itemprop="name headline">
                     $it.title$
diff --git a/templates/partials/grid_card.html b/templates/partials/grid_card.html
index c8c110c..9af9415 100644
--- a/templates/partials/grid_card.html
+++ b/templates/partials/grid_card.html
@@ -18,21 +18,18 @@ $if(it.url)$
         $endif$
         <div class="l-media__block l-media__block--main">
             $if(it.subtitle)$
-                <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong>
+                <strong class="u-d-block u-elp">$it.title$</strong>
                 <small class="u-d-block u-elp">$it.subtitle$</small>
             $elseif(it.category)$
                 <small class="u-d-block u-elp">$it.category$</small>
-                <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong>
+                <strong class="u-d-block u-elp">$it.title$</strong>
             $elseif(it.date)$
                 <time datetime="$it.date.yyyy_mm_dd$" itemprop="dateCreated">
-                    <small class="u-d-none@sm-hi">
-                        $it.date.short$
-                    </small>
-                    <small class="u-d-none@sm-lo">
+                    <small>
                         $it.date.long$
                     </small>
                 </time>
-                <strong class="u-d-block u-elp p-name" itemprop="name headline">$it.title$</strong>
+                <strong class="u-d-block u-elp">$it.title$</strong>
             $else$
                 <span class="p-name" itemprop="name headline">
                     $it.title$
diff --git a/templates/partials/list_card.html b/templates/partials/list_card.html
index 6335786..744ca8a 100644
--- a/templates/partials/list_card.html
+++ b/templates/partials/list_card.html
@@ -16,27 +16,36 @@ $if(it.url)$
                 <use href="/icons.svg#$it.icon$"></use>
             </svg>
         $endif$
-        <div class="l-media__block l-media__block--main p-name" itemprop="name headline">
+        <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>
+            $elseif(it.category)$
+                <small class="u-d-block">$it.category$</small>
+                <strong class="u-d-block">$it.title$</strong>
+            $elseif(it.date)$
+                <time datetime="$it.date.yyyy_mm_dd$" class="u-d-block"><small>$it.date.long$</small></time>
+                <strong class="u-d-block">$it.title$</strong>
+            $else$
+                <span class="p-name" itemprop="name headline">
+                    $it.title$
+                </span>
+            $endif$
+        </div> 
+        <div class="l-media__block l-media__block--main u-d-none@sm-lo">
             $it.title$
         </div> 
         $if(it.subtitle)$
-            <div class="l-media__block u-fs0">
-                <small>
-                    $it.subtitle$
-                </small>
-            </div>
+            <small class="l-media__block u-d-none@sm-lo">
+                $it.subtitle$
+            </small>
         $elseif(it.category)$
-            <div class="l-media__block u-fs0">
-                <small>
-                    $it.category$
-                </small>
-            </div>
+            <small class="l-media__block u-d-none@sm-lo">
+                $it.category$
+            </small>
         $elseif(it.date)$
-            <time datetime="$it.date.yyyy_mm_dd$" class="l-media__block u-fs0" itemprop="dateCreated">
-                <small class="u-d-none@sm-hi">
-                    $it.date.short$
-                </small>
-                <small class="u-d-none@sm-lo">
+            <time datetime="$it.date.yyyy_mm_dd$" class="l-media__block u-d-none@sm-lo" itemprop="dateCreated">
+                <small>
                     $it.date.long$
                 </small>
             </time>