Backport plusjade/jekyll-bootstrap#293

apache · Sep 7, 2016 · 68f4d64 · 68f4d64
1 parent 09f770e
commit 68f4d64
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/_includes/JB/setup b/_includes/JB/setup
@@ -17,7 +17,7 @@
     {% if site.JB.ASSET_PATH %}
       {% assign ASSET_PATH = site.JB.ASSET_PATH %}
     {% else %}
-      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{{ page.theme.name }}{% endcapture %}
-    {% endif %}  
+      {% capture ASSET_PATH %}{{ BASE_PATH }}/assets/themes/{% if page.theme.name %}{{ page.theme.name }}{% else if %}{{ layout.theme.name }}{% endif %}{% endcapture %}
+    {% endif %}
   {% endif %}
-{% endcapture %}{% assign jbcache = nil %}
+{% endcapture %}{% assign jbcache = nil %}