Atlas48/funky
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Atlas48:1.0.4
Branches Tags
Atlas48:master
Atlas48:1.0.5 Atlas48:1.0.4 Atlas48:1.0.3 Atlas48:1.0.2 Atlas48:1.0.1 Atlas48:1.0.0
..
compare: Atlas48:1.0.5
Branches Tags
Atlas48:master
Atlas48:1.0.5 Atlas48:1.0.4 Atlas48:1.0.3 Atlas48:1.0.2 Atlas48:1.0.1 Atlas48:1.0.0

5 Commits
1.0.4 ... 1.0.5

Author SHA1 Message Date
David Darnes
d5603a44ae Clean up indentation 2020-01-06 15:01:27 +00:00
David Darnes
3f31c09342 Version bump 1.0.5 2020-01-06 14:58:02 +00:00
David Darnes
d3c4b6a131 Merge pull request #25 from JordiGarcL/fix-version 
Update jekyll and bundle versions in gemspec
 2020-01-06 14:56:12 +00:00
Jordi García L
99bfa05bed Define a range for the versions 2020-01-06 13:51:56 +01:00
Jordi García L
455efc9c3c Update jekyll and bundle versions in gemspec 
Trying to use this theme as a gem on a fresh jekyll install results in the following error:

```
Bundler could not find compatible versions for gem "jekyll":
  In Gemfile:
    jekyll (~> 4.0.0)

    garth-jekyll-theme (~> 1.0.4) was resolved to 1.0.4, which depends on
      jekyll (~> 3.6)
```

This PR fixes the issue by updating the jekyll depencency.
 2020-01-01 18:07:02 +01:00
3 changed files with 30 additions and 30 deletions
Expand all files Collapse all files

46
_includes/post-list.html
View File

@@ -1,34 +1,34 @@
{% if paginator.posts %}
<ul class="list list--posts">
{% for page in paginator.posts %}
<li class="item item--post">
<article class="article article--post typeset">
<ul class="list list--posts">
{% for page in paginator.posts %}
<li class="item item--post">
<article class="article article--post typeset">
<h2><a href="{{ site.baseurl }}{{ page.url }}">{{ page.title }}</a></h2>
{% include post-meta.html %}
{{ page.excerpt | markdownify | truncatewords: 60 }}
<h2><a href="{{ site.baseurl }}{{ page.url }}">{{ page.title }}</a></h2>
{% include post-meta.html %}
{{ page.excerpt | markdownify | truncatewords: 60 }}
</article>
</li>
{% endfor %}
</ul>
{% include post-pagination.html %}
</article>
</li>
{% endfor %}
</ul>
{% include post-pagination.html %}
{% else %}
<ul class="list list--posts">
{% for page in site.posts %}
<li class="item item--post">
<article class="article article--post typeset">
<ul class="list list--posts">
{% for page in site.posts %}
<li class="item item--post">
<article class="article article--post typeset">
<h2><a href="{{ site.baseurl }}{{ page.url }}">{{ page.title }}</a></h2>
{% include post-meta.html %}
{{ page.excerpt | markdownify | truncatewords: 60 }}
<h2><a href="{{ site.baseurl }}{{ page.url }}">{{ page.title }}</a></h2>
{% include post-meta.html %}
{{ page.excerpt | markdownify | truncatewords: 60 }}
</article>
</li>
{% endfor %}
</ul>
</article>
</li>
{% endfor %}
</ul>
{% endif %}

8
_includes/site-nav.html
View File

@@ -4,11 +4,11 @@
{% unless item.title == false or item.url contains "/page" or item.url contains "/404.html" or item.url contains "/feed." %}
<li class="item item--nav{% if item.url == page.url %} item--current{% endif %}">
{% if item.collectionpage %}
{% assign collectiondata = site.collections | where: "label", item.collectionpage | first %}
<a href="{{ site.baseurl }}{{ item.url }}">{{ collectiondata.title }}</a>
{% else %}
{% assign collectiondata = site.collections | where: "label", item.collectionpage | first %}
<a href="{{ site.baseurl }}{{ item.url }}">{{ collectiondata.title }}</a>
{% else %}
<a href="{{ site.baseurl }}{{ item.url }}">{{ item.title }}</a>
{% endif %}
{% endif %}
</li>
{% endunless %}
{% endfor %}

6
garth-jekyll-theme.gemspec
View File

@@ -2,7 +2,7 @@
Gem::Specification.new do |spec|
spec.name = "garth-jekyll-theme"
spec.version = "1.0.4"
spec.version = "1.0.5"
spec.authors = ["David Darnes"]
spec.email = ["me@daviddarnes.com"]
@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README)}i) }
spec.add_runtime_dependency "jekyll", "~> 3.6"
spec.add_runtime_dependency "jekyll", ">= 3.6", "< 5.0"
spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
spec.add_development_dependency "bundler", "~> 1.14"
spec.add_development_dependency "bundler", ">= 1.14", "< 3.0"
end