jekyll-theme-bas-style-kit 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a56cc128c5a45c3cc09c6aa8302f3637e7ebad32
-  data.tar.gz: 235c350940d5acc5a81ce529535004a754e1b148
+  metadata.gz: 43005268ee83aaa5337b6e532257497dc626f6d3
+  data.tar.gz: ac58744ceca48c0205bf4829d5a05bb40c143220
 SHA512:
-  metadata.gz: 6c9df02310e8cd1646246a0a865ba28127883bffa7abde5a0523bbc45488279033255ccbfb3ce91fa29e83aedd9fc9354972fbbb0d1c9a3c0e814a97661674a5
-  data.tar.gz: 4379eacbf303c3ac5057fd239c4b0bf9df2b586b3910ccbc8fe26ed90a2ac12200f710a3b89bfb7b8c30a78bb1af53046710361425b8884c5c2593993b0761e5
+  metadata.gz: b5e731ccf2c76965384e261b14a2ff7163f4f3c0163c74dfbf10a44cd51fb6b36f8170d8cebbbb0e0db0808f18cc7720e7b1bfa40aae5a5ba7408d51930facc4
+  data.tar.gz: 34472b3459a6e0511ac07bb5f838b3be723ed47366c0541fc130ccb1dafce84c003c574ce9ee1c30b0f645205ad7889edf59844d6a98f537aa40c37bc716c284

data/CHANGELOG.md

@@ -5,8 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## [Unreleased][unreleased]
 
+## 0.1.1 - Skipped
+
 ## 0.1.0 - 12/03/2017
 
 ### Added
 
+* Note that the Gem for this project is one minor version ahead of this version due to a technical error
 * Initial project - based on BAS Style Kit version 0.1.0, and adapted from the BAS Style Kit documentation Jekyll site

data/_includes/layout/site-navigation.html

@@ -17,9 +17,10 @@
         {% for item in site.nav_items %}
             {% comment %} Single navbar items {% endcomment %}
             {% if item.type == 'single_item' %}
-            {% assign page_url = page.url | remove: '.html' %}
-            <li {% if page_url == item.href %} class="active"{% endif %}>
-                {% if page_url == item.url %}<span class="sr-only">(current)</span>{% endif %}
+              {% assign page_url = page.url | remove: '.html' %}
+              {% assign item_url = item.href | append: '/' %}
+            <li {% if page_url == item.href %}class="active"{% endif %} {% unless page_url == '/' %}{% unless item.href == '/' %}{% if page_url == item_url %} class="active"{% endif %}{% endunless %}{% endunless %}>
+                {% if page_url == item.href %}<span class="sr-only">(current)</span>{% endif %} {% unless page_url == '/' %}{% unless item.href == '/' %}{% if page_url + '/' == item.href %}<span class="sr-only">(current)</span>{% endif %}{% endunless %}{% endunless %}
                 <a href="{{ item.href }}">{{ item.name }}</a>
             </li>
 
@@ -30,6 +31,10 @@
                     {% if page_url == action.href %}
                         {% assign is_active = true %}
                     {% endif %}
+                    {% assign action_url = action.href | append: '/' %}
+                    {% if page_url == action_url %}
+                        {% assign is_active = true %}
+                    {% endif %}
                 {% endfor %}
             <li class="dropdown {% if is_active %}active{% endif %}">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
@@ -37,9 +42,10 @@
                 {{ item.name }} <span class="caret"></span></a>
                 <ul class="dropdown-menu dropdown-menu-bsk">
                 {% for action in item.actions %}
-                    <li {% if page_url == action.href %} class="active"{% endif %}>
-                        {% if page_url == action.href %}<span class="sr-only">(current)</span>{% endif %}
-                        <a href="{{ action.href }}">{{ action.name }}</a>
+                    {% assign action_url = action.href | append: '/' %}
+                    <li {% if page_url == action.href %}class="active"{% endif %} {% unless page_url == '/' %}{% unless action.href == '/' %}{% if page_url == action_url %} class="active"{% endif %}{% endunless %}{% endunless %}>
+                      {% if page_url == action.href %}class="active"{% endif %} {% unless page_url == '/' %}{% unless action.href == '/' %}{% if page_url == action_url %}<span class="sr-only">(current)</span>{% endif %}{% endunless %}{% endunless %}
+                      <a href="{{ action.href }}">{{ action.name }}</a>
                     </li>
                 {% endfor %}
                 </ul>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-bas-style-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Felix Fennell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll