Skip to content

Commit

Permalink
Fix incorrect asset paths
Browse files Browse the repository at this point in the history
Github Pages upgraded to Jekyll 3 -
which includes major breaking changes -
and did not tell anyone about it....

See:
- plusjade/jekyll-bootstrap#295
- http://jekyllrb.com/docs/upgrading/2-to-3/#layout-metadata
  • Loading branch information
eschwartz committed Sep 18, 2017
1 parent 3282a5a commit d4bf173
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# For more see: http://jekyllrb.com/docs/permalinks/
permalink: /:categories/:year/:month/:day/:title

exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md"]
exclude: [".rvmrc", ".rbenv-version", "README.md", "Rakefile", "changelog.md", "vendor"]
highlighter: pygments

# Themes are encouraged to use these universal variables
Expand All @@ -23,7 +23,7 @@ author :
# Else if you are pushing to username.github.io, replace with your username.
# Finally if you are pushing to a GitHub project page, include the project name at the end.
#
production_url : http://blog.edanschwartz.com
production_url : http://eschwartz.github.io

# All Jekyll-Bootstrap specific configurations are namespaced into this hash
#
Expand Down
2 changes: 1 addition & 1 deletion _includes/JB/setup
Original file line number Diff line number Diff line change
Expand Up @@ -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/{{ layout.theme.name }}{% endcapture %}
{% endif %}
{% endif %}
{% endcapture %}{% assign jbcache = nil %}
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<link rel="icon" type="image/png" href="{{ ASSET_PATH }}/images/avatar.png">

<link href='http://fonts.googleapis.com/css?family=Lato:700|Libre+Baskerville:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{ ASSET_PATH }}/css/{{ page.stylesheet }}.css"/>
<link rel="stylesheet" href="{{ ASSET_PATH }}/css/{{ layout.stylesheet }}.css"/>
</head>
<body>

Expand Down
1 change: 1 addition & 0 deletions _layouts/page.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: default
stylesheet: 'post-list'
---
{% include JB/setup %}

Expand Down
1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
layout: page
stylesheet: 'post-list'
---

<ul class="post-list">
Expand Down

0 comments on commit d4bf173

Please sign in to comment.