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

2016-03-27 20:13:45 -07:00 · 2016-03-27 20:13:45 -07:00 · 0f997ee179
commit 0f997ee179
parent a0ec106d3d
6 changed files with 58 additions and 48 deletions
--- a/_config.yml
+++ b/_config.yml
@ -85,6 +85,7 @@ defaults:
      path: ""
      type: "posts"
    values:
+      layout: "post"
      comments: true  # add comments to all blog posts
  -
    scope:
--- a/_layouts/base.html
+++ b/_layouts/base.html
@ -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>
--- a/_layouts/default.html
+++ b/_layouts/default.html
@ -1,32 +1,9 @@
 ---
-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"
+layout: base
 ---

-<!DOCTYPE html>
-<html lang="en">
-
-  {% include head.html %}
-
-  <body>
-
-    {% include nav.html %}
+<div class="intro-header"></div>

+<div role="main" class="container">
  {{ content }}
-
-    {% include footer.html %}
-
-    {% include footer-scripts.html %}
-
-  </body>
-</html>
+</div>
--- a/_layouts/minimal.html
+++ b/_layouts/minimal.html
@ -14,7 +14,7 @@ common-js:

  <body>

-    <div role="main" class="container main-content">
+    <div role="main" class="container">
      {{ content }}
    </div>

--- a/_layouts/page.html
+++ b/_layouts/page.html
@ -1,5 +1,5 @@
 ---
-layout: default
+layout: base
 ---

 {% include header.html type="page" %}
--- a/_layouts/post.html
+++ b/_layouts/post.html
@ -1,5 +1,5 @@
 ---
-layout: default
+layout: base
 ---

 {% include header.html type="post" %}