use post layout by default for blog posts; use same layouts as my website

This commit is contained in:
Dean Attali 2016-03-27 20:13:45 -07:00
parent a0ec106d3d
commit 0f997ee179
6 changed files with 58 additions and 48 deletions

View File

@ -85,6 +85,7 @@ defaults:
path: "" path: ""
type: "posts" type: "posts"
values: values:
layout: "post"
comments: true # add comments to all blog posts comments: true # add comments to all blog posts
- -
scope: scope:

32
_layouts/base.html Normal file
View File

@ -0,0 +1,32 @@
---
common-css:
- "/css/bootstrap.min.css"
- "/css/main.css"
common-ext-css:
- "//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"
common-googlefonts:
- "Lora:400,700,400italic,700italic"
- "Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
common-js:
- "/js/jquery-1.11.2.min.js"
- "/js/bootstrap.min.js"
- "/js/main.js"
---
<!DOCTYPE html>
<html lang="en">
{% include head.html %}
<body>
{% include nav.html %}
{{ content }}
{% include footer.html %}
{% include footer-scripts.html %}
</body>
</html>

View File

@ -1,32 +1,9 @@
--- ---
common-css: layout: base
- "/css/bootstrap.min.css"
- "/css/main.css"
common-ext-css:
- "//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"
common-googlefonts:
- "Lora:400,700,400italic,700italic"
- "Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
common-js:
- "/js/jquery-1.11.2.min.js"
- "/js/bootstrap.min.js"
- "/js/main.js"
--- ---
<!DOCTYPE html> <div class="intro-header"></div>
<html lang="en">
{% include head.html %} <div role="main" class="container">
{{ content }}
<body> </div>
{% include nav.html %}
{{ content }}
{% include footer.html %}
{% include footer-scripts.html %}
</body>
</html>

View File

@ -14,7 +14,7 @@ common-js:
<body> <body>
<div role="main" class="container main-content"> <div role="main" class="container">
{{ content }} {{ content }}
</div> </div>

View File

@ -1,5 +1,5 @@
--- ---
layout: default layout: base
--- ---
{% include header.html type="page" %} {% include header.html type="page" %}
@ -8,11 +8,11 @@ layout: default
<div class="row"> <div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
{{ content }} {{ content }}
{% if page.comments %} {% if page.comments %}
<div class="disqus-comments"> <div class="disqus-comments">
{% include disqus.html %} {% include disqus.html %}
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,5 +1,5 @@
--- ---
layout: default layout: base
--- ---
{% include header.html type="post" %} {% include header.html type="post" %}
@ -8,27 +8,27 @@ layout: default
<div class="row"> <div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1"> <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
<article role="main" class="blog-post"> <article role="main" class="blog-post">
{{ content }} {{ content }}
</article> </article>
<ul class="pager blog-pager"> <ul class="pager blog-pager">
{% if page.previous.url %} {% if page.previous.url %}
<li class="previous"> <li class="previous">
<a href="{{ page.previous.url | prepend: site.baseurl | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title}}">&larr; Previous Post</a> <a href="{{ page.previous.url | prepend: site.baseurl | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.previous.title}}">&larr; Previous Post</a>
</li> </li>
{% endif %} {% endif %}
{% if page.next.url %} {% if page.next.url %}
<li class="next"> <li class="next">
<a href="{{ page.next.url | prepend: site.baseurl | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title}}">Next Post &rarr;</a> <a href="{{ page.next.url | prepend: site.baseurl | replace: '//', '/' }}" data-toggle="tooltip" data-placement="top" title="{{page.next.title}}">Next Post &rarr;</a>
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
{% if page.comments %} {% if page.comments %}
<div class="disqus-comments"> <div class="disqus-comments">
{% include disqus.html %} {% include disqus.html %}
</div> </div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
</div> </div>