diff options
Diffstat (limited to '_layouts')
| -rw-r--r-- | _layouts/all_posts.html | 64 | ||||
| -rw-r--r-- | _layouts/base.html | 20 | ||||
| -rw-r--r-- | _layouts/default.html | 17 | ||||
| -rw-r--r-- | _layouts/home.html | 67 | ||||
| -rw-r--r-- | _layouts/page.html | 13 | ||||
| -rw-r--r-- | _layouts/post.html | 42 |
6 files changed, 42 insertions, 181 deletions
diff --git a/_layouts/all_posts.html b/_layouts/all_posts.html index c81df2f..9c29be9 100644 --- a/_layouts/all_posts.html +++ b/_layouts/all_posts.html @@ -1,61 +1,15 @@ --- -layout: base +layout: default --- -<div class="home"> - {%- if page.title -%} - <h1 class="page-heading">{{ page.title }}</h1> - {%- endif -%} +<h1>{{ page.title }}</h1> - {{ content }} - - - {% if site.paginate %} - {% assign posts = paginator.posts %} - {% else %} - {% assign posts = site.posts %} - {% endif %} - - - {%- if posts.size > 0 -%} - {%- if page.list_title -%} - <h2 class="post-list-heading">{{ page.list_title }}</h2> - {%- endif -%} - <ul class="post-list"> - {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} - {%- for post in posts -%} - <li> - <span class="post-meta">{{ post.date | date: date_format }}</span> - <h3> - <a class="post-link" href="{{ post.url | relative_url }}"> - {{ post.title | escape }} - </a> - </h3> - {%- if site.show_excerpts -%} - {{ post.excerpt }} - {%- endif -%} - </li> - {%- endfor -%} - </ul> - - {% if site.paginate %} - <div class="pager"> - <ul class="pagination"> - {%- if paginator.previous_page %} - <li><a href="{{ paginator.previous_page_path | relative_url }}" class="previous-page">{{ paginator.previous_page }}</a></li> - {%- else %} - <li><div class="pager-edge">•</div></li> - {%- endif %} - <li><div class="current-page">{{ paginator.page }}</div></li> - {%- if paginator.next_page %} - <li><a href="{{ paginator.next_page_path | relative_url }}" class="next-page">{{ paginator.next_page }}</a></li> - {%- else %} - <li><div class="pager-edge">•</div></li> - {%- endif %} - </ul> - </div> - {%- endif %} - - {%- endif -%} +{{ content }} +{% for post in site.posts %} +<div class="post"> + <h3><a href="{{ post.url }}">{{ post.title }}</a></h3> + <span class="post-date">{{ post.date | date: "%B %-d, %Y" }}</span> </div> +{% endfor %} + diff --git a/_layouts/base.html b/_layouts/base.html deleted file mode 100644 index 58e141b..0000000 --- a/_layouts/base.html +++ /dev/null @@ -1,20 +0,0 @@ -<!DOCTYPE html> -<html lang="{{ page.lang | default: site.lang | default: "en" }}"> - - {%- include head.html -%} - - <body> - - {%- include header.html -%} - - <main class="page-content" aria-label="Content"> - <div class="wrapper"> - {{ content }} - </div> - </main> - - {%- include footer.html -%} - - </body> - -</html> diff --git a/_layouts/default.html b/_layouts/default.html new file mode 100644 index 0000000..8e7dae7 --- /dev/null +++ b/_layouts/default.html @@ -0,0 +1,17 @@ +<!DOCTYPE html> +<html lang="{{ page.lang | default: site.lang | default: 'en' }}"> + + {%- include head.html -%} + + <body> + <div class="wrapper"> + {%- include header.html -%} + <main> + {{ content }} + </main> + {%- include sidebar.html -%} + {%- include footer.html -%} + </div> + </body> + +</html> diff --git a/_layouts/home.html b/_layouts/home.html index 44b51e6..5fea726 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -1,63 +1,14 @@ --- -layout: base +layout: default --- -<div class="home"> - {%- if page.title -%} - <h1 class="page-heading">{{ page.title }}</h1> - {%- endif -%} - - {{ content }} - - - {% if site.paginate %} - {% assign posts = paginator.posts %} - {% else %} - {% assign posts = site.posts %} - {% endif %} - - - {%- if posts.size > 0 -%} - {%- if page.list_title -%} - <h2 class="post-list-heading">{{ page.list_title }}</h2> - {%- endif -%} - <ul class="post-list"> - {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} - {%- for post in site.posts limit:5 -%} - <li> - <span class="post-meta">{{ post.date | date: date_format }}</span> - <h3> - <a class="post-link" href="{{ post.url | relative_url }}"> - {{ post.title | escape }} - </a> - </h3> - {%- if site.show_excerpts -%} - {{ post.excerpt }} - {%- endif -%} - </li> - {%- endfor -%} - </ul> - - {% if site.paginate %} - <div class="pager"> - <ul class="pagination"> - {%- if paginator.previous_page %} - <li><a href="{{ paginator.previous_page_path | relative_url }}" class="previous-page">{{ paginator.previous_page }}</a></li> - {%- else %} - <li><div class="pager-edge">•</div></li> - {%- endif %} - <li><div class="current-page">{{ paginator.page }}</div></li> - {%- if paginator.next_page %} - <li><a href="{{ paginator.next_page_path | relative_url }}" class="next-page">{{ paginator.next_page }}</a></li> - {%- else %} - <li><div class="pager-edge">•</div></li> - {%- endif %} - </ul> - </div> - {%- endif %} - - <a href="/posts">See All Posts →</a> - - {%- endif -%} +{{ content }} +{% for post in site.posts limit:5 %} +<div class="post"> + <h3><a href="{{ post.url }}">{{ post.title }}</a></h3> + <span class="post-date">{{ post.date | date: "%B %-d, %Y" }}</span> + {{ post.excerpt }} </div> +{% endfor %} + diff --git a/_layouts/page.html b/_layouts/page.html index 18544b4..80476ae 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -1,14 +1,7 @@ --- -layout: base +layout: default --- -<article class="post"> - <header class="post-header"> - <h1 class="post-title">{{ page.title | escape }}</h1> - </header> +<h1>{{ page.title }}</h1> - <div class="post-content"> - {{ content }} - </div> - -</article> +{{ content }} diff --git a/_layouts/post.html b/_layouts/post.html index 2eaedf4..50545e8 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,42 +1,8 @@ --- -layout: base +layout: default --- -<article class="post h-entry" itemscope itemtype="http://schema.org/BlogPosting"> - <header class="post-header"> - <h1 class="post-title p-name" itemprop="name headline">{{ page.title | escape }}</h1> - <p class="post-meta"> - {%- assign date_format = site.minima.date_format | default: "%b %-d, %Y" -%} - <time class="dt-published" datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished"> - {{ page.date | date: date_format }} - </time> - {%- if page.modified_date -%} - ~ - {%- assign mdate = page.modified_date | date_to_xmlschema -%} - <time class="dt-modified" datetime="{{ mdate }}" itemprop="dateModified"> - {{ mdate | date: date_format }} - </time> - {%- endif -%} - {%- if page.author -%} - • {% for author in page.author %} - <span itemprop="author" itemscope itemtype="http://schema.org/Person"> - <span class="p-author h-card" itemprop="name">{{ author }}</span></span> - {%- if forloop.last == false %}, {% endif -%} - {% endfor %} - {%- endif -%}</p> - </header> +<h1>{{ page.title }}</h1> +<p><small>{{ page.date | date: "%B %-d, %Y" }}</small></p> - <div class="post-content e-content" itemprop="articleBody"> - {{ content }} - </div> - - <div> - <hr style="margin:40px auto;width:65%;"> - {% if page.previous.url %} - <a class="prev" href="{{page.previous.url}}">« {{page.previous.title}}</a> - {% endif %} - {% if page.next.url %} - <a class="next" href="{{page.next.url}}">{{page.next.title}} »</a> - {% endif %} - </div> -</article> +{{ content }} |