2 files changed, 23 insertions, 55 deletions

diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html
index 50555f8..e0bd1db 100644
--- a/templates/layouts/categorized_list.html
+++ b/templates/layouts/categorized_list.html
@@ -13,55 +13,27 @@ $body$
             $if(it.description)$
                 <div class="s-small s-colored-links">$it.description$</div>
             $endif$
-            $if(it.layout.is_grid)$
-                <div class="l-card-list__cards l-card-list__cards--grid">
+            <div class="l-card-list__cards l-card-list__cards--$it.layout.id$">
+                $if(it.layout.is_grid)$
                     $it.items:partials/grid_card()$
-                    $if(it.omitted)$
-                        <a href="$it.url.rel$" class="l-card-list__card c-card c-card--outline">
-                            <div class="c-card__row">
-                                <div class="c-card__block c-card__block--main">
-                                    $it.omitted$ more items
-                                </div>
-                                <svg class="c-card__block o-icon" width="1em" height="1em">
-                                    <use href="/symbols.svg#icon-arrow-right"></use>
-                                </svg>
-                            </div>
-                        </a>
-                    $endif$
-                </div>
-            $elseif(it.layout.is_gallery)$
-                <div class="l-card-list__cards l-card-list__cards--gallery">
+                $elseif(it.layout.is_gallery)$
                     $it.items:partials/gallery_card()$
-                    $if(it.omitted)$
-                        <a href="$it.url.rel$" class="l-card-list__card c-card c-card--outline">
-                            <div class="c-card__row">
-                                <div class="c-card__block c-card__block--main">
-                                    $it.omitted$ more items
-                                </div>
-                                <svg class="c-card__block o-icon" width="1em" height="1em">
-                                    <use href="/symbols.svg#icon-arrow-right"></use>
-                                </svg>
-                            </div>
-                        </a>
-                    $endif$
-                </div>
-            $else$
-                <div class="l-card-list__cards">
+                $else$
                     $it.items:partials/list_card()$
-                    $if(it.omitted)$
-                        <a href="$it.url.rel$" class="l-card-list__card c-card c-card--outline">
-                            <div class="c-card__row">
-                                <div class="c-card__block c-card__block--main">
-                                    $it.omitted$ more items
-                                </div>
-                                <svg class="c-card__block o-icon" width="1em" height="1em">
-                                    <use href="/symbols.svg#icon-arrow-right"></use>
-                                </svg>
+                $endif$
+                $if(it.omitted)$
+                    <a href="$it.url.rel$" class="l-card-list__card c-card c-card--outline">
+                        <div class="c-card__row">
+                            <div class="c-card__block c-card__block--main">
+                                $it.omitted$ more items
                             </div>
-                        </a>
-                    $endif$
-                </div>
-            $endif$
+                            <svg class="c-card__block o-icon" width="1em" height="1em">
+                                <use href="/symbols.svg#icon-arrow-right"></use>
+                            </svg>
+                        </div>
+                    </a>
+                $endif$
+            </div>
         </section>
     $endfor$
 </div>
diff --git a/templates/layouts/list.html b/templates/layouts/list.html
index 9c6b26e..40d85f0 100644
--- a/templates/layouts/list.html
+++ b/templates/layouts/list.html
@@ -5,19 +5,15 @@ $body$
 </header>
 
 <div class="l-card-list">
-    $if(list_layout.is_grid)$
-        <div class="l-card-list__cards l-card-list__cards--grid">
+    <div class="l-card-list__cards l-card-list__cards--$list_layout.id$">
+        $if(list_layout.is_grid)$
             $list:partials/grid_card()$
-        </div>
-    $elseif(list_layout.is_gallery)$
-        <div class="l-card-list__cards l-card-list__cards--gallery">
+        $elseif(list_layout.is_gallery)$
             $list:partials/gallery_card()$
-        </div>
-    $else$
-        <div class="l-card-list__cards">
+        $else$
             $list:partials/list_card()$
-        </div>
-    $endif$
+        $endif$
+    </div>
 </div>