Skip to content

Instantly share code, notes, and snippets.

@kaworu
Created June 17, 2015 15:25
Show Gist options
  • Save kaworu/e3064d8617bff1d9f0d7 to your computer and use it in GitHub Desktop.
Save kaworu/e3064d8617bff1d9f0d7 to your computer and use it in GitHub Desktop.
diff --git a/source/_layouts/page.html b/source/_layouts/page.html
index 294eada..73eabc1 100644
--- a/source/_layouts/page.html
+++ b/source/_layouts/page.html
@@ -3,6 +3,16 @@ layout: default
---
<div class="row">
+ {% unless page.sidebar == false or site.page_asides == empty and site.default_asides == empty %}
+ <aside class="sidebar col-md-3">
+ {% if site.page_asides.size %}
+ {% include_array page_asides %}
+ {% else %}
+ {% include_array default_asides %}
+ {% endif %}
+ </aside>
+ {% endunless %}
+
<div class="page-content {% unless page.sidebar == false or site.page_asides == empty and site.default_asides == empty %}col-md-9{% else %}col-md-12{% endunless %}">
<article role="article">
{% unless page.no_header %}
@@ -45,14 +55,4 @@ layout: default
</section>
{% endif %}
</div>
-
- {% unless page.sidebar == false or site.page_asides == empty and site.default_asides == empty %}
- <aside class="sidebar col-md-3">
- {% if site.page_asides.size %}
- {% include_array page_asides %}
- {% else %}
- {% include_array default_asides %}
- {% endif %}
- </aside>
- {% endunless %}
</div>
diff --git a/source/_layouts/post.html b/source/_layouts/post.html
index 153a61b..5c7e992 100644
--- a/source/_layouts/post.html
+++ b/source/_layouts/post.html
@@ -5,6 +5,16 @@ single: true
---
<div class="row">
+ {% unless page.sidebar == false or site.post_asides == empty and site.default_asides == empty %}
+ <aside class="sidebar col-md-3">
+ {% if site.post_asides.size %}
+ {% include_array post_asides %}
+ {% else %}
+ {% include_array default_asides %}
+ {% endif %}
+ </aside>
+ {% endunless %}
+
<div class="page-content {% unless page.sidebar == false or site.post_asides == empty and site.default_asides == empty %}col-md-9{% else %}col-md-12{% endunless %}" itemscope itemtype="http://schema.org/Blog">
<meta itemprop="name" content="{{site.title}}" />
{% if site.description %}<meta itemprop="description" content="{{site.description}}" />{% endif %}
@@ -39,14 +49,4 @@ single: true
</section>
{% endif %}
</div>
-
- {% unless page.sidebar == false or site.post_asides == empty and site.default_asides == empty %}
- <aside class="sidebar col-md-3">
- {% if site.post_asides.size %}
- {% include_array post_asides %}
- {% else %}
- {% include_array default_asides %}
- {% endif %}
- </aside>
- {% endunless %}
</div>
diff --git a/source/index.html b/source/index.html
index 82318a8..95f28a4 100644
--- a/source/index.html
+++ b/source/index.html
@@ -4,6 +4,16 @@ navbar: Blog
---
<div class="row">
+ {% unless site.default_asides == empty and site.blog_index_asides == empty %}
+ <aside class="sidebar col-md-3">
+ {% if site.blog_index_asides.size %}
+ {% include_array blog_index_asides %}
+ {% else %}
+ {% include_array default_asides %}
+ {% endif %}
+ </aside>
+ {% endunless %}
+
<div class="page-content {% unless site.default_asides == empty and site.blog_index_asides == empty %}col-md-9{% else %}col-md-12{% endunless %}">
<div class="blog-index" itemscope itemtype="http://schema.org/Blog">
<meta itemprop="name" content="{{site.title}}" />
@@ -32,14 +42,4 @@ navbar: Blog
{% endif %}
</ul>
</div>
-
- {% unless site.default_asides == empty and site.blog_index_asides == empty %}
- <aside class="sidebar col-md-3">
- {% if site.blog_index_asides.size %}
- {% include_array blog_index_asides %}
- {% else %}
- {% include_array default_asides %}
- {% endif %}
- </aside>
- {% endunless %}
</div>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment