4 files changed, 48 insertions, 56 deletions
diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html
index 256e9de..20c0ee5 100644
--- a/templates/layouts/categorized_list.html
+++ b/templates/layouts/categorized_list.html
@@ -1,29 +1,27 @@
-<section class="l-container l-container--pad-x l-container--pad-y l-container--content">
+<div class="s-headlines s-colored-links">
-    <div class="s-headlines s-colored-links">
+    <h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
-        <h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
 $body$
-    </div>
+</div>
-    <div class="c-card-list">
+<div class="c-card-list">
-        $for(list)$
+    $for(list)$
-            <header class="c-card-list__category-header">
+        <header class="c-card-list__category-header">
-                <h2 class="c-card-list__category-title">
+            <h2 class="c-card-list__category-title">
-                    <a href="$it.url.rel$">$it.title$</a>
+                <a href="$it.url.rel$">$it.title$</a>
-                </h2>
+            </h2>
-                $if(it.content)$
+            $if(it.content)$
-                    <small class="c-card-list__category-subtitle">$it.content$</small>
+                <small class="c-card-list__category-subtitle">$it.content$</small>
-                $endif$
-            </header>
-            $if(it.grid)$
-                <div class="c-card-list__category-content c-card-list__category-content--grid">
-                    $it.items:partials/grid_card()$
-                </div>
-            $else$
-                <div class="c-card-list__category-content">
-                    $it.items:partials/list_card()$
-                </div>
            $endif$
-        $endfor$
+        </header>
-    </div>
+        $if(it.grid)$
-</section>
+            <div class="c-card-list__category-content c-card-list__category-content--grid">
+                $it.items:partials/grid_card()$
+            </div>
+        $else$
+            <div class="c-card-list__category-content">
+                $it.items:partials/list_card()$
+            </div>
+        $endif$
+    $endfor$
+</div>
diff --git a/templates/layouts/list.html b/templates/layouts/list.html
index 7a9d573..ff29314 100644
--- a/templates/layouts/list.html
+++ b/templates/layouts/list.html
@@ -1,21 +1,19 @@
-<section class="l-container l-container--pad-x l-container--pad-y l-container--content">
+<div class="s-headlines s-colored-links">
-    <div class="s-headlines s-colored-links">
+    <h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
-        <h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
 $body$
-    </div>
+</div>
-    <div class="c-card-list">
+<div class="c-card-list">
-        $if(list_grid)$
+    $if(list_grid)$
-            <div class="c-card-list__category-content c-card-list__category-content--grid">
+        <div class="c-card-list__category-content c-card-list__category-content--grid">
-                $list:partials/grid_card()$
+            $list:partials/grid_card()$
-            </div>
+        </div>
-        $else$
+    $else$
-            <div class="c-card-list__category-content">
+        <div class="c-card-list__category-content">
-                $list:partials/list_card()$
+            $list:partials/list_card()$
-            </div>
+        </div>
-        $endif$
+    $endif$
-    </div>
+</div>
-</section>
diff --git a/templates/layouts/page.html b/templates/layouts/page.html
index f1060ca..f6d3b53 100644
--- a/templates/layouts/page.html
+++ b/templates/layouts/page.html
@@ -1,13 +1,11 @@
-<div class="s-body">
+<div class="s-body s-colored-links s-headlines">
-    <section class="l-container l-container--pad-x l-container--pad-y l-container--content s-colored-links s-headlines">
+    $if(date)$
-        $if(date)$
+        <div class="s-body__meta">
-            <div class="s-body__meta">
+            $date.long$
-                $date.long$
+        </div>
-            </div>
+    $endif$
-        $endif$
-        <h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
+    <h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
-    $body$
+$body$
-    </section>
 </div>
diff --git a/templates/layouts/redirect.html b/templates/layouts/redirect.html
index a51d47e..457b4fe 100644
--- a/templates/layouts/redirect.html
+++ b/templates/layouts/redirect.html
@@ -1,6 +1,4 @@
-<div class="s-body">
+<div class="s-body s-colored-links s-headlines">
-    <section class="l-container l-container--pad-x l-container--pad-y l-container--content s-colored-links s-headlines">
+    <h1 class="u-mt0"><span class="s-headlines__title-inner">Redirect</span></h1>
-        <h1 class="u-mt0"><span class="s-headlines__title-inner">Redirect</span></h1>
+    <p>This page should redirect you to <a href="$url.full$">$url.full$</a> in 3 seconds.</p>
-        <p>This page should redirect you to <a href="$url.full$">$url.full$</a> in 3 seconds.</p>
-    </section>
 </div>

diff --git a/templates/layouts/categorized_list.html b/templates/layouts/categorized_list.html index 256e9de..20c0ee5 100644 --- a/templates/layouts/categorized_list.html +++ b/templates/layouts/categorized_list.html
@@ -1,29 +1,27 @@
1	<section class="l-container l-container--pad-x l-container--pad-y l-container--content">	1	<div class="s-headlines s-colored-links">
2	<div class="s-headlines s-colored-links">	2	<h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
3	<h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
4		3
5	$body$	4	$body$
6	</div>	5	</div>
7		6
8	<div class="c-card-list">	7	<div class="c-card-list">
9	$for(list)$	8	$for(list)$
10	<header class="c-card-list__category-header">	9	<header class="c-card-list__category-header">
11	<h2 class="c-card-list__category-title">	10	<h2 class="c-card-list__category-title">
12	<a href="$it.url.rel$">$it.title$</a>	11	<a href="$it.url.rel$">$it.title$</a>
13	</h2>	12	</h2>
14	$if(it.content)$	13	$if(it.content)$
15	<small class="c-card-list__category-subtitle">$it.content$</small>	14	<small class="c-card-list__category-subtitle">$it.content$</small>
16	$endif$
17	</header>
18	$if(it.grid)$
19	<div class="c-card-list__category-content c-card-list__category-content--grid">
20	$it.items:partials/grid_card()$
21	</div>
22	$else$
23	<div class="c-card-list__category-content">
24	$it.items:partials/list_card()$
25	</div>
26	$endif$	15	$endif$
27	$endfor$	16	</header>
28	</div>	17	$if(it.grid)$
29	</section>	18	<div class="c-card-list__category-content c-card-list__category-content--grid">
		19	$it.items:partials/grid_card()$
		20	</div>
		21	$else$
		22	<div class="c-card-list__category-content">
		23	$it.items:partials/list_card()$
		24	</div>
		25	$endif$
		26	$endfor$
		27	</div>


diff --git a/templates/layouts/list.html b/templates/layouts/list.html index 7a9d573..ff29314 100644 --- a/templates/layouts/list.html +++ b/templates/layouts/list.html
@@ -1,21 +1,19 @@
1	<section class="l-container l-container--pad-x l-container--pad-y l-container--content">	1	<div class="s-headlines s-colored-links">
2	<div class="s-headlines s-colored-links">	2	<h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
3	<h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
4		3
5	$body$	4	$body$
6	</div>	5	</div>
7		6
8	<div class="c-card-list">	7	<div class="c-card-list">
9	$if(list_grid)$	8	$if(list_grid)$
10	<div class="c-card-list__category-content c-card-list__category-content--grid">	9	<div class="c-card-list__category-content c-card-list__category-content--grid">
11	$list:partials/grid_card()$	10	$list:partials/grid_card()$
12	</div>	11	</div>
13	$else$	12	$else$
14	<div class="c-card-list__category-content">	13	<div class="c-card-list__category-content">
15	$list:partials/list_card()$	14	$list:partials/list_card()$
16	</div>	15	</div>
17	$endif$	16	$endif$
18	</div>	17	</div>
19	</section>
20		18
21		19


diff --git a/templates/layouts/page.html b/templates/layouts/page.html index f1060ca..f6d3b53 100644 --- a/templates/layouts/page.html +++ b/templates/layouts/page.html
@@ -1,13 +1,11 @@
1	<div class="s-body">	1	<div class="s-body s-colored-links s-headlines">
2	<section class="l-container l-container--pad-x l-container--pad-y l-container--content s-colored-links s-headlines">	2	$if(date)$
3	$if(date)$	3	<div class="s-body__meta">
4	<div class="s-body__meta">	4	$date.long$
5	$date.long$	5	</div>
6	</div>	6	$endif$
7	$endif$
8		7
9	<h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>	8	<h1 class="u-mt0"><span class="s-headlines__title-inner">$title$</span></h1>
10		9
11	$body$	10	$body$
12	</section>
13	</div>	11	</div>


diff --git a/templates/layouts/redirect.html b/templates/layouts/redirect.html index a51d47e..457b4fe 100644 --- a/templates/layouts/redirect.html +++ b/templates/layouts/redirect.html
@@ -1,6 +1,4 @@
1	<div class="s-body">	1	<div class="s-body s-colored-links s-headlines">
2	<section class="l-container l-container--pad-x l-container--pad-y l-container--content s-colored-links s-headlines">	2	<h1 class="u-mt0"><span class="s-headlines__title-inner">Redirect</span></h1>
3	<h1 class="u-mt0"><span class="s-headlines__title-inner">Redirect</span></h1>	3	<p>This page should redirect you to <a href="$url.full$">$url.full$</a> in 3 seconds.</p>
4	<p>This page should redirect you to <a href="$url.full$">$url.full$</a> in 3 seconds.</p>
5	</section>
6	</div>	4	</div>