Merge pull request #293 from qh/issue-290

Issue 290
plusjade · Jan 16, 2016 · c3d3cbe · c3d3cbe
2 parents 19765f2 + a2526d0
commit c3d3cbe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/_includes/JB/setup b/_includes/JB/setup
@@ -16,7 +16,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 %}
+      {% 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 %}