Skip to content

Commit 0d5fb07

Browse files
bradfrostbmuenzenmeyer
authored andcommitted
Merge branch 'master' of github.com:bradfrost/pl-website-eleventy
1 parent 84026cc commit 0d5fb07

18 files changed

+117
-245
lines changed
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<div class="c-page-header">
22

3+
{% if introKicker %}
4+
<p class="c-page-header__kicker">{{ introKicker }}</p>
5+
{% endif %}
6+
37
<h1 class="c-page-header__title">{{ introHeading }}</h1>
48

5-
{% if page.description %}
6-
<p class="c-page-header__desc">{{ page.description }}</p>
9+
{% if introDescription %}
10+
<p class="c-page-header__desc">{{ introDescription }}</p>
711
{% endif %}
812

913
</div><!-- end c-page-header -->
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{% extends 'layouts/base.njk' %}
2-
{% set pageType = 'Post Archive' %}
32

43
{# Intro content #}
54
{% set introHeading = title %}
6-
{% set introSummary %}{{ content | safe }}{% endset %}
5+
{% set introDescription = description %}
76

87
{# Post list content #}
9-
{% set postListHeading = 'All posts' %}
108
{% set postListItems = collections.posts %}
119

1210
{% block content %}
1311
<main id="main-content">
14-
{% include "partials/components/intro.njk" %}
15-
{% include "partials/components/post-list.njk" %}
12+
<div class="l-container">
13+
{% include "components/page-header.njk" %}
14+
{% include "partials/components/post-list.njk" %}
15+
</div>
1616
</main>
1717
{% endblock %}

packages/docs/src/_includes/layouts/page.njk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
<div class="l-container">
99
<div class="l-linelength-container">
1010
<article class="[ post ] [ h-entry ]">
11-
{% include "partials/components/intro.njk" %}
12-
<div class="[ post__body ] [ inner-wrapper ] [ leading-loose pad-top-900 pad-bottom-900 text-500 ] [ sf-flow ] [ e-content ]">
13-
{{ content | safe }}
14-
</div>
11+
{% include "components/page-header.njk" %}
12+
{{ content | safe }}
1513
</article>
1614
</div>
1715
</div>

packages/docs/src/_includes/layouts/post.njk

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{% set pageType = 'Post' %}
33

44
{# Intro content #}
5+
{% set introKicker = date | dateFilter %}
56
{% set introHeading = title %}
67
{% set introSummary %}
78
<p class="[ intro__meta ] [ text-500 leading-tight ]">
@@ -16,27 +17,11 @@
1617
<div class="l-container">
1718
<div class="l-linelength-container">
1819
<article class="[ post ] [ h-entry ]">
19-
{% include "partials/components/intro.njk" %}
2020
{% include "components/page-header.njk" %}
21+
2122
<div class="c-text-passage">
2223
{{ content | safe }}
2324
</div>
24-
{% if tags %}
25-
<footer class="[ post__footer ] [ pad-top-500 pad-bottom-500 ]">
26-
<div class="inner-wrapper">
27-
<div class="[ nav ] [ box-flex align-center ]">
28-
<h2 class="font-base text-600 weight-mid">Filed under</h2>
29-
<ul class="[ nav__list ] [ box-flex align-center pad-left-400 ] [ p-category ]">
30-
{% for item in tags %}
31-
<li class="nav__item">
32-
<a href="/tags/{{ item }}">{{ item }}</a>
33-
</li>
34-
{% endfor %}
35-
</ul>
36-
</div>
37-
</div>
38-
</footer>
39-
{% endif %}
4025
</article>
4126
</div>
4227
</div>

packages/docs/src/_includes/partials/components/intro.njk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<header class="[ intro ] [ pad-top-900 pad-bottom-max ]">
2-
<div class="[ inner-wrapper ] [ sf-flow ]">
3-
<h1 class="[ intro__heading{{ ' intro__heading--compact' if page.url === '/' }} ] [ text-800 md:text-900 leading-tight ] [ p-name ]">{{ introHeading }}</h1>
2+
<div>
3+
<h1>{{ introHeading }}</h1>
44
{% if introSummary %}
55
<div class="[ intro__summary ] [ sf-flow ] [ leading-mid measure-short ]">{{ introSummary | safe }}</div>
66
{% endif %}

packages/docs/src/_includes/partials/components/post-list.njk

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1+
12
{% if postListItems.length %}
23

3-
<ol>
4+
<ol class="c-stacked-block-list">
45
{% for item in postListItems %}
5-
{% if item.date.getTime() <= global.now %}
6-
<li class="post-list__item">
7-
<a href="{{ item.url }}" class="post-list__link" rel="bookmark">{{ item.data.title }}</a>
6+
<li class="c-stacked-block-list__item">
7+
<a href="{{ item.data.url }}" class="c-post-block" rel="bookmark">
8+
<time class="c-stacked-block__kicker" datetime="{{ item.data.date | dateFilter }}">{{ item.data.date | dateFilter }}</time>
9+
<h2 class="c-stacked-block__title">
10+
11+
{{ item.data.title }}
12+
</h2>
13+
<p class="c-stacked-block__description">
14+
{{ item.data.description}}
15+
</p>
16+
</a>
17+
818
</li>
9-
{% endif %}
1019
{% endfor %}
1120
</ol>
1221

packages/docs/src/posts/a-post-with-code-samples.md

Lines changed: 0 additions & 63 deletions
This file was deleted.

packages/docs/src/posts/a-post-with-figures-and-video.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

packages/docs/src/posts/a-scheduled-post.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

packages/docs/src/posts/a-simple-post.md

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)