jekyll-theme-bas-style-kit 0.2.2 → 0.2.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 27e058d72d3084eb2185c1df62d36d07f1b22197
4
- data.tar.gz: 01c5f19ad9bb5ba81f7d9c1af6c4f0740711c930
3
+ metadata.gz: a2f2c85c81743f860da21189915fc3445913fef5
4
+ data.tar.gz: 0e4c8b3a3c54c9de7fd398ddd2d52343b61cf17b
5
5
  SHA512:
6
- metadata.gz: ca06ea89900753879f17f966be66d01019b2477e4221e8ae28e651c7e3bf6f3b346ff466af35b3104f7058057fcc871e8b81f33bb7ef2aa14ba1772bf98fc491
7
- data.tar.gz: dc774fa7b8f205b0d8eea90892ec45fbd01a69c6fbd80af311b7eb7cb3c870b7ef3b67444e7805ee2258a62e163cf40e7d24c9fcfcfe48686b60b2ad16043915
6
+ metadata.gz: 13d28f56684c9102f23257c6baa3401ca58c1eadb538f20beb233675134fbddfca5d93a29efc0ad6d9235b94b58037c56dd6a56214745fe72f458955386aa57d
7
+ data.tar.gz: ae23be77c6ea67ae92dc3aa48ea56ba0cda7e7500525bf08e067db55215edf7b823ef5083a1ba0d891670d8f7f49454aa80440ef95842ccc7d6a9f77b526ded4
data/CHANGELOG.md CHANGED
@@ -7,6 +7,18 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
7
7
 
8
8
  ### Added
9
9
 
10
+ * Note in release notes to ensure the Jekyll variable is updated to reflect the changed version
11
+
12
+ ### Fixed
13
+
14
+ * Error in site-navigation include, where once an item is found to be active, all subsequent items are flagged as well
15
+ * Inconsistent indentation in site-navigation include
16
+ * Incorrectly displaying active class name instead of screen-reader active element, in drop-down main navigation items
17
+
18
+ ## 0.2.2 - 21/03/2017
19
+
20
+ ### Added
21
+
10
22
  * Jekyll Data plugin as a theme/gem dependency, allows default config options to be set, and the use of theme data files
11
23
 
12
24
  ### Changed
data/README.md CHANGED
@@ -744,6 +744,8 @@ listed it won't be included. This is separate to the Git `.gitignore` file.
744
744
  9. `docker-compose run app gem build jekyll-theme-bas-style-kit.gemspec`
745
745
  10. `docker-compose run app gem push jekyll-theme-bas-style-kit-*.gem`
746
746
 
747
+ **Note:** If the BAS Style Kit version changes, make sure to bump that version in `_data/bsk_jekyll_vars.json` too.
748
+
747
749
  ## Issue tracking
748
750
 
749
751
  This project uses issue tracking, see the
@@ -1,4 +1,4 @@
1
1
  {
2
- "theme_version": "0.2.2",
2
+ "theme_version": "0.2.3",
3
3
  "bsk_version": "0.1.0"
4
4
  }
@@ -15,42 +15,45 @@
15
15
  <div class="collapse navbar-collapse" id="site-navbar-collapse">
16
16
  <ul class="nav navbar-nav">
17
17
  {% for item in site.nav_items %}
18
- {% comment %} Single navbar items {% endcomment %}
19
- {% if item.type == 'single_item' %}
20
- {% assign page_url = page.url | remove: '.html' %}
21
- {% assign item_url = item.href | append: '/' %}
22
- <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 %}>
23
- {% 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 %}
24
- <a href="{{ item.href }}">{{ item.name }}</a>
25
- </li>
18
+ {% comment %} Reset the active flag for each run-through to prevent multiple items being flagged as active {% endcomment %}
19
+ {% assign is_active = false %}
20
+
21
+ {% comment %} Single navbar items {% endcomment %}
22
+ {% if item.type == 'single_item' %}
23
+ {% assign page_url = page.url | remove: '.html' %}
24
+ {% assign item_url = item.href | append: '/' %}
25
+ <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 %}>
26
+ {% 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 %}
27
+ <a href="{{ item.href }}">{{ item.name }}</a>
28
+ </li>
26
29
 
27
- {% comment %} Dropdown navbar items {% endcomment %}
28
- {% elsif item.type == 'dropdown_item' %}
29
- {% assign page_url = page.url | remove: '.html' %}
30
- {% for action in item.actions %}
31
- {% if page_url == action.href %}
32
- {% assign is_active = true %}
33
- {% endif %}
34
- {% assign action_url = action.href | append: '/' %}
35
- {% if page_url == action_url %}
36
- {% assign is_active = true %}
37
- {% endif %}
38
- {% endfor %}
39
- <li class="dropdown {% if is_active %}active{% endif %}">
40
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
41
- {% if is_active %}<span class="sr-only">(current)</span>{% endif %}
42
- {{ item.name }} <span class="caret"></span></a>
43
- <ul class="dropdown-menu dropdown-menu-bsk">
44
- {% for action in item.actions %}
45
- {% assign action_url = action.href | append: '/' %}
46
- <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 %}>
47
- {% 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 %}
48
- <a href="{{ action.href }}">{{ action.name }}</a>
49
- </li>
50
- {% endfor %}
51
- </ul>
52
- </li>
53
- {% endif %}
30
+ {% comment %} Dropdown navbar items {% endcomment %}
31
+ {% elsif item.type == 'dropdown_item' %}
32
+ {% assign page_url = page.url | remove: '.html' %}
33
+ {% for action in item.actions %}
34
+ {% if page_url == action.href %}
35
+ {% assign is_active = true %}
36
+ {% endif %}
37
+ {% assign action_url = action.href | append: '/' %}
38
+ {% if page_url == action_url %}
39
+ {% assign is_active = true %}
40
+ {% endif %}
41
+ {% endfor %}
42
+ <li class="dropdown {% if is_active %}active{% endif %}">
43
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
44
+ {% if is_active %}<span class="sr-only">(current)</span>{% endif %}
45
+ {{ item.name }} <span class="caret"></span></a>
46
+ <ul class="dropdown-menu dropdown-menu-bsk">
47
+ {% for action in item.actions %}
48
+ {% assign action_url = action.href | append: '/' %}
49
+ <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 %}>
50
+ {% if page_url == action.href %}<span class="sr-only">(current)</span>{% endif %} {% unless page_url == '/' %}{% unless action.href == '/' %}{% if page_url == action_url %}<span class="sr-only">(current)</span>{% endif %}{% endunless %}{% endunless %}
51
+ <a href="{{ action.href }}">{{ action.name }}</a>
52
+ </li>
53
+ {% endfor %}
54
+ </ul>
55
+ </li>
56
+ {% endif %}
54
57
  {% endfor %}
55
58
  </ul><!-- /.navbar-nav -->
56
59
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-theme-bas-style-kit
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ version: 0.2.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Felix Fennell
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-21 00:00:00.000000000 Z
11
+ date: 2017-04-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll