Skip to content

Commit

Permalink
Merge pull request #11 from corneadoug/fix/otherRenderingIssues
Browse files Browse the repository at this point in the history
Backport plusjade/jekyll-bootstrap#293 + add .html to `pages_list` links
  • Loading branch information
Alexander authored Sep 7, 2016
2 parents 09f770e + f774bb0 commit 2b04e4a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions _includes/JB/pages_list
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ Usage:
{% for cat in node.group %}
{% if cat == group %}
{% if page.url == node.url %}
<li class="active"><a href="{{ BASE_PATH }}{{node.url}}" class="active">{{node.title}}</a></li>
<li class="active"><a href="{{ BASE_PATH }}{{node.url}}.html" class="active">{{node.title}}</a></li>
{% else %}
<li><a href="{{ BASE_PATH }}{{node.url}}">{{node.title}}</a></li>
<li><a href="{{ BASE_PATH }}{{node.url}}.html">{{node.title}}</a></li>
{% endif %}
{% endif %}
{% endfor %}
Expand Down
6 changes: 3 additions & 3 deletions _includes/JB/setup
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}

0 comments on commit 2b04e4a

Please sign in to comment.