Merge branch 'master' into dev

flextype-themes · Aug 19, 2020 · e3397ea · e3397ea
2 parents f6878c1 + 72770b4
commit e3397ea
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.2.0"></a>
+# [1.2.0](https://github.com/flextype-themes/bootstrap-site) (2020-08-19)
+
+### Features
+
+* **core** update code base for new Flextype 0.9.10
+
 <a name="1.1.0"></a>
 # [1.1.0](https://github.com/flextype-themes/bootstrap-site) (2020-08-05)
 

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-site/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-themes/bootstrap-site.svg?label=version&color=black"></a> <a href="https://github.com/flextype-themes/bootstrap-site"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-themes/bootstrap-site"><img src="https://img.shields.io/github/downloads/flextype-themes/bootstrap-site/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype-themes/bootstrap-site"><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-site/releases"><img alt="Version" src="https://img.shields.io/github/release/flextype-themes/bootstrap-site.svg?label=version&color=black"></a> <a href="https://github.com/flextype-themes/bootstrap-site"><img src="https://img.shields.io/badge/license-MIT-blue.svg?color=black" alt="License"></a> <a href="https://github.com/flextype-themes/bootstrap-site"><img src="https://img.shields.io/github/downloads/flextype-themes/bootstrap-site/total.svg?color=black" alt="Total downloads"></a> <a href="https://github.com/flextype-themes/bootstrap-site"><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 Sit
 
 | 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/partials/base.html b/templates/partials/base.html
@@ -45,7 +45,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 Site
-version: 1.1.0
+version: 1.2.0
 description: Twitter Bootstrap Site theme for Flextype.
 author:
   name: Sergey Romanenko
@@ -10,6 +10,6 @@ bugs: https://github.com/flextype-themes/bootstrap-site/issues
 license: MIT
 
 dependencies:
-  flextype: 0.9.9
+  flextype: 0.9.10
   site: '>=1.0.0'
   twig: '>=1.0.0'