Merge branch 'master' into dev

flextype-themes · Aug 19, 2020 · ae79957 · ae79957
2 parents cb470ba + 26727c6
commit ae79957
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.4.0"></a>
+# [1.4.0](https://github.com/flextype-themes/bootstrap-blog) (2020-08-19)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.10
+
 <a name="1.3.0"></a>
 # [1.3.0](https://github.com/flextype-themes/bootstrap-blog) (2020-08-07)
 

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 ![preview](preview.png)
 
 <p align="center">
-<a href="https://github.com/flextype-themes/bootstrap-blog/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-themes/bootstrap-blog.svg?label=version&color=black"></a> <a href="https://github.com/flextype-themes/bootstrap-blog"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-themes/bootstrap-blog"><img src="https://img.shields.io/github/downloads/flextype-themes/bootstrap-blog/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype-themes/bootstrap-blog"><img src="https://img.shields.io/badge/Flextype-0.9.9-green.svg?color=black" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
+<a href="https://github.com/flextype-themes/bootstrap-blog/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-themes/bootstrap-blog.svg?label=version&color=black"></a> <a href="https://github.com/flextype-themes/bootstrap-blog"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-themes/bootstrap-blog"><img src="https://img.shields.io/github/downloads/flextype-themes/bootstrap-blog/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype-themes/bootstrap-blog"><img src="https://img.shields.io/badge/Flextype-0.9.10-green.svg?color=black" alt="Flextype"></a> <a href=""><img src="https://img.shields.io/discord/423097982498635778.svg?logo=discord&color=black&label=Discord%20Chat" alt="Discord"></a>
 </p>
 
 ## Features
@@ -18,7 +18,7 @@ The following dependencies need to be downloaded and installed for Bootstrap Blo
 
 | Item | Version | Download |
 |---|---|---|
-| [flextype](https://github.com/flextype/flextype) | 0.9.9 | [download](https://github.com/flextype/flextype/) |
+| [flextype](https://github.com/flextype/flextype) | 0.9.10 | [download](https://github.com/flextype/flextype/) |
 | [site](https://github.com/flextype-plugins/site) | >=1.0.0 | [download](https://github.com/flextype-plugins/site/releases) |
 | [twig](https://github.com/flextype-plugins/twig) | >=1.0.0 | [download](https://github.com/flextype-plugins/twig/releases) |
 

diff --git a/templates/blog-post.html b/templates/blog-post.html
@@ -44,9 +44,9 @@ <h1>{{ entry.title }}</h1>
  <h3 class="mb-2">Related Posts</h3>
  <ul class="pl-0 list-unstyled">
  {% for related_post in related_posts %}
- {% if related_post.slug != entry.slug %}
+ {% if related_post.id != entry.id %}
  <li class="mb-1">
- <a href="{{ url() }}/{{ related_post.slug }}">
+ <a href="{{ url() }}/{{ related_post.id }}">
  {{ related_post.title }}
  </a>
  </li>

diff --git a/templates/blog.html b/templates/blog.html
@@ -61,7 +61,7 @@
  <div class="col-md-9">
  {% for post in blog_posts %}
  <div class="blog-post">
- <a href="{{ post.slug }}"><h2 class="blog-post-title">{{ post.title }}</h2></a>
+ <a href="{{ post.id }}"><h2 class="blog-post-title">{{ post.title }}</h2></a>
  <p>{{ post.summary|shortcode|raw}}</p>
  <p class="blog-post-meta">
  <svg class="bi bi-calendar3-fill" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
@@ -96,7 +96,7 @@ <h3 class="text-left mb-2">Recent Posts</h3>
  .where('visibility', 'nin', ['draft', 'hidden'])
  .orderBy('published_at', 'DESC')
  .limit(blog_posts_limit) %}
- <li class="mb-1"><a href="{{ url() }}/{{ post.slug }}">{{ post.title }}</a></li>
+ <li class="mb-1"><a href="{{ url() }}/{{ post.id }}">{{ post.title }}</a></li>
  {% endfor %}
  </ul>
  {# /recent-posts #}

diff --git a/templates/partials/base.html b/templates/partials/base.html
@@ -48,7 +48,7 @@
  <ul class="navbar-nav mr-auto">
  {% for item in collect(entries.fetchCollection('')).orderBy('menu_item_order', 'ASC').all() %}
  {% if item.menu_item_title %}
- <li class="nav-item {% if item.menu_item_url in entry.slug %}active{% endif %}">
+ <li class="nav-item {% if item.menu_item_url in entry.id %}active{% endif %}">
  <a class="nav-link" href="{{ url() }}/{{ item.menu_item_url }}">{{ item.menu_item_title }}</a>
  </li>
  {% endif %}

diff --git a/theme.yaml b/theme.yaml
@@ -1,5 +1,5 @@
 name: Bootstrap Blog Theme
-version: 1.3.0
+version: 1.4.0
 description: Twitter Bootstrap Blog theme for Flextype.
 author:
  name: Sergey Romanenko
@@ -10,6 +10,6 @@ bugs: https://github.com/flextype-themes/bootstrap-blog/issues
 license: MIT
 
 dependencies:
- flextype: 0.9.9
+ flextype: 0.9.10
  site: '>=1.0.0'
  twig: '>=1.0.0'