jekyll-theme-bas-style-kit 0.11.0 → 0.12.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (22) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +11 -0
  3. data/README.md +1 -1
  4. data/_config.yml +4 -0
  5. data/_data/bas-style-kit/bsk-css.yml +6 -2
  6. data/_data/bas-style-kit/bsk-js.yml +10 -7
  7. data/_data/bas-style-kit/bsk-vars.yml +2 -2
  8. data/_includes/bas-style-kit/bsk--pattern--item-type-header.html +2 -2
  9. data/_includes/bas-style-kit/bsk-body--back-to-top.html +1 -1
  10. data/_includes/bas-style-kit/bsk-body--standard-footer.html +1 -0
  11. data/_includes/bas-style-kit/bsk-footer--back-to-top.html +1 -1
  12. data/_includes/bas-style-kit/bsk-footer--governance.html +1 -1
  13. data/_includes/bas-style-kit/bsk-footer--is-something-wrong.html +1 -1
  14. data/_includes/bas-style-kit/bsk-footer--legal-policies.html +4 -4
  15. data/_includes/bas-style-kit/bsk-header--site-navigation.html +1 -1
  16. data/_includes/bas-style-kit/bsk-nav--header.html +4 -4
  17. data/_includes/bas-style-kit/bsk-nav-collapse--primary-navigation.html +4 -4
  18. data/_includes/bas-style-kit/bsk-nav-collapse--secondary-navigation.html +3 -3
  19. data/_includes/bas-style-kit/bsk-nav-header--brand.html +1 -1
  20. data/_includes/bas-style-kit/bsk-nav-header--collapse-trigger.html +3 -6
  21. data/_layouts/bas-style-kit/bsk--standard-page.html +3 -3
  22. metadata +13 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 857666e665b0c111fc76c3cc8e6fb6fe31901026d2cb3ca3934a43a3fa489040
4
- data.tar.gz: 6fd109b6a4ade7f9eb8a3b6c92df36999683a5130603f30164f1e8b1309d3fd5
3
+ metadata.gz: 194f92e1a48e34f3c5f4c166fa13350e1386ca751f4ad1b13ff553d925597b83
4
+ data.tar.gz: cb95e052911d3c996ce48b4eca3dfc3213e74fcd2228c16042624f270aae222d
5
5
  SHA512:
6
- metadata.gz: a8ff20ced3b6ff5f97266d91fe546108ed8c8a4918031285384515c61da8c4687107751a18881a6c87230fbcd0e425c61ca02ab41711b0fa1fc5f8c5e54b5e01
7
- data.tar.gz: 529f1b50ecbcdd7b56a0cdb224a934d5a3ec8618f7ef312f02252767f2663578d28fb6e17bb89d3b571c68f8d30e2fa817945765d57082f2a3885bfcbe89cbae
6
+ metadata.gz: cc7b0f6ce645b93ef051213c47668930e0d88da11a5cbf883327a080fecddf81f46ff5d88ec8490eecb69812eed3a3508d02059c1c12b5e98a43c564da5ebd04
7
+ data.tar.gz: d1e3f6e88465d75176cde948ba8e288541718211639018bd95567307d7c4760a6a7882248462da27226c7189584b2ae580b6712984cf8b6cc460c56e8bac3d46
data/CHANGELOG.md CHANGED
@@ -5,6 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
5
5
 
6
6
  ## [Unreleased][unreleased]
7
7
 
8
+ ## 0.12.0 - 2023-07-13
9
+
10
+ ### Added
11
+
12
+ * Updated to Style Kit 0.7.0-alpha
13
+ * Updated to jQuery 3.6.0
14
+ * Updated to Jekyll 4.3.2
15
+
16
+ ### Removed
17
+
18
+ * jQuery
8
19
  ## 0.11.0 - 2021-03-17
9
20
 
10
21
  ### Added
data/README.md CHANGED
@@ -735,7 +735,7 @@ After release:
735
735
 
736
736
  1. bump the version in:
737
737
  * `jekyll-theme-bas-style-kit.gemspec`
738
- * `_data/bsk_jekyll_vars.json`
738
+ * `_data/bsk_jekyll_vars.json` - or here? `_data/bas-style-kit/bsk-vars.yml`
739
739
  2. build and push the app docker image [1]
740
740
  3. commit changes, merge with master and close release branch
741
741
 
data/_config.yml CHANGED
@@ -6,6 +6,10 @@
6
6
  # Additional config options are defined using the Jekyll Data plugin, under the `site.data.bsk_jekyll_vars` namespace.
7
7
  # E.g. `site.data.bsk_jekyll_vars.bsk_attributes.bsk_version` gives the version of the BAS Style Kit this theme uses.
8
8
 
9
+ webrick:
10
+ headers:
11
+ Access-Control-Allow-Origin: "*"
12
+
9
13
  # Plugins (required by this theme)
10
14
  #
11
15
 
data/_data/bas-style-kit/bsk-css.yml CHANGED
@@ -1,5 +1,9 @@
1
1
  ---
2
2
  -
3
- href: 'https://cdn.web.bas.ac.uk/bas-style-kit/0.6.1/css/bas-style-kit.min.css'
4
- integrity: 'sha256-k05vjok9IGTMBJ8KYnQYX9sEc7A9eGWsTM8tQ2XqE8A='
3
+ href: 'https://fly-bas-style-kit.fly.dev/css/bas-style-kit.css'
4
+ # integrity: 'sha256-k05vjok9IGTMBJ8KYnQYX9sEc7A9eGWsTM8tQ2XqE8A='
5
5
  type: 'remote'
6
+ -
7
+ # href: 'http://localhost:8043/develop/dist/css/bas-style-kit.css'
8
+ # integrity: 'sha256-k05vjok9IGTMBJ8KYnQYX9sEc7A9eGWsTM8tQ2XqE8A='
9
+ # type: 'remote'
data/_data/bas-style-kit/bsk-js.yml CHANGED
@@ -1,13 +1,16 @@
1
1
  ---
2
2
  -
3
- href: 'https://cdn.web.bas.ac.uk/libs/jquery/3.6.0/js/jquery-3.6.0.min.js'
4
- integrity: 'sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4='
3
+ href: 'https://cdn.jsdelivr.net/gh/orestbida/cookieconsent@v2.8.9/dist/cookieconsent.js'
4
+ # integrity: 'need to add...'
5
5
  type: 'remote'
6
6
  -
7
- href: 'https://cdn.web.bas.ac.uk/libs/js-cookie/2.2.1/js/js.cookie-2.2.1.min.js'
8
- integrity: 'sha256-MdF5lmO7tgKSFNkLp9uc3HJfoCwW1LCQrdNyHkQji2s='
7
+ href: 'https://fly-bas-style-kit.fly.dev/js/bas-style-kit.js'
9
8
  type: 'remote'
9
+ # -
10
+ # href: 'https://cdn.web.bas.ac.uk/bas-style-kit/0.6.0-beta/js/bas-style-kit.min.js'
11
+ # integrity: 'sha256-IGaRkrHf/T62GN0E75YL3iLtvmbifinJXfSo8GohRB0='
12
+ # type: 'remote'
10
13
  -
11
- href: 'https://cdn.web.bas.ac.uk/bas-style-kit/0.6.1/js/bas-style-kit.min.js'
12
- integrity: 'sha256-cW+jowQERFqjJwdZ1VSZgG7dXQly19ykM5kVIONXmFg='
13
- type: 'remote'
14
+ # href: 'http://localhost:8043/develop/dist/js/bas-style-kit.js'
15
+ # integrity: 'sha256-cW+jowQERFqjJwdZ1VSZgG7dXQly19ykM5kVIONXmFg='
16
+ # type: 'local'
data/_data/bas-style-kit/bsk-vars.yml CHANGED
@@ -1,3 +1,3 @@
1
1
  ---
2
- theme_version: "0.12.0"
3
- bsk_version: "0.6.1"
2
+ theme_version: "0.14.0"
3
+ bsk_version: "0.7.0-alpha"
data/_includes/bas-style-kit/bsk--pattern--item-type-header.html CHANGED
@@ -1,7 +1,7 @@
1
1
  <header class="bsk-page-header bsk-page-header-stacked">
2
2
  <h1>
3
- <small class="bsk-text-capitalize">{{ include.item_type }}</small>
4
- <br />
3
+ <!-- <small class="bsk-text-capitalize">{{ include.item_type }}</small>
4
+ <br /> -->
5
5
  {{ include.item_title }}
6
6
  </h1>
7
7
  </header>
data/_includes/bas-style-kit/bsk-body--back-to-top.html CHANGED
@@ -1,2 +1,2 @@
1
1
  <div id="site-top"></div>
2
- <a class="bsk-sr-only bsk-sr-only-focusable" href="#site-content">Skip to main content</a>
2
+ <a class="bsk-visually-hidden-focusable" href="#site-content">Skip to main content</a>
data/_includes/bas-style-kit/bsk-body--standard-footer.html CHANGED
@@ -12,6 +12,7 @@
12
12
  {% endif %}
13
13
  {% include bas-style-kit/bsk-footer--contents.html %}
14
14
  {% if site.bas_style_kit_jekyll_theme.feature_flags.standard_footer.divider == true %}
15
+ <div class="bsk-clearfix"></div>
15
16
  <div role="separator" class="bsk-footer-divider"></div>
16
17
  {% endif %}
17
18
  {% if site.bas_style_kit_jekyll_theme.feature_flags.standard_footer.governance == true %}
data/_includes/bas-style-kit/bsk-footer--back-to-top.html CHANGED
@@ -1,3 +1,3 @@
1
- <div class="bsk-footer-back-to-top">
1
+ <div class="bsk-footer-back-to-top bsk-float-end">
2
2
  <a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_back_to_top_target_href }}"> Back to top</a>
3
3
  </div>
data/_includes/bas-style-kit/bsk-footer--governance.html CHANGED
@@ -1,4 +1,4 @@
1
- <div class="bsk-footer-governance">
1
+ <div class="bsk-footer-governance bsk-float-start">
2
2
  The <a href="https://www.bas.ac.uk">British Antarctic Survey</a> (BAS) is part of <a href="https://www.ukri.org">UK Research and Innovation</a> (UKRI)
3
3
  <div class="bsk-footer-ogl"><div class="bsk-ogl-symbol"><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.ogl.href }}" rel="license"><span class="bsk-ogl-symbol">Open Government Licence</span></a></div>
4
4
  All content is available under the <a href="http://www.nationalarchives.gov.uk/doc/open-government-licence" rel="license">Open Government Licence {{ site.bas_style_kit_jekyll_theme.attributes.site_footer.ogl.text_version }}</a>, except where otherwise stated</div>
data/_includes/bas-style-kit/bsk-footer--is-something-wrong.html CHANGED
@@ -1,3 +1,3 @@
1
- <div class="bsk-footer-is-something-wrong">
1
+ <div class="bsk-footer-is-something-wrong bsk-float-start">
2
2
  <a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_feedback_href }}" target="_blank">Is something wrong with this page?</a>
3
3
  </div>
data/_includes/bas-style-kit/bsk-footer--legal-policies.html CHANGED
@@ -1,8 +1,8 @@
1
- <div class="bsk-footer-policy-links">
1
+ <div class="bsk-footer-policy-links bsk-float-end">
2
2
  <ul class="bsk-list-inline">
3
- <li><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.cookies_href }}"> Cookies</a></li>
4
- <li><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.copyright_href }}"> Copyright</a></li>
5
- <li><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.privacy_href }}"> Privacy</a></li>
3
+ <li class="bsk-list-inline-item"><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.cookies_href }}"> Cookies</a></li>
4
+ <li class="bsk-list-inline-item"><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.copyright_href }}"> Copyright</a></li>
5
+ <li class="bsk-list-inline-item"><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.privacy_href }}"> Privacy</a></li>
6
6
  </ul>
7
7
  © {{site.time | date: "%Y"}} British Antarctic Survey
8
8
  </div>
data/_includes/bas-style-kit/bsk-header--site-navigation.html CHANGED
@@ -1,4 +1,4 @@
1
- <nav class="bsk-navbar">
1
+ <nav class="bsk-navbar bsk-navbar-expand-md bsk-navbar-dark bsk-bg-dark">
2
2
  <div class="{{ bsk_attributes_container_class }}">
3
3
  {% include bas-style-kit/bsk-nav--header.html %}
4
4
  {% include bas-style-kit/bsk-nav--collapse.html %}
data/_includes/bas-style-kit/bsk-nav--header.html CHANGED
@@ -1,4 +1,4 @@
1
- <div class="bsk-navbar-header">
2
- {% include bas-style-kit/bsk-nav-header--collapse-trigger.html %}
3
- {% include bas-style-kit/bsk-nav-header--brand.html %}
4
- </div>
1
+
2
+ {% include bas-style-kit/bsk-nav-header--brand.html %}
3
+ {% include bas-style-kit/bsk-nav-header--collapse-trigger.html %}
4
+
data/_includes/bas-style-kit/bsk-nav-collapse--primary-navigation.html CHANGED
@@ -8,14 +8,14 @@
8
8
  {% assign is_active = true %}
9
9
  {% endif %}
10
10
  {% endfor %}
11
- <li class="bsk-dropdown {% if is_active == true %}bsk-active{% endif %}">
12
- <a class="bsk-dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
11
+ <li class="bsk-nav-item bsk-nav-item bsk-dropdown {% if is_active == true %}bsk-active{% endif %}">
12
+ <a class="bsk-dropdown-toggle bsk-nav-link" href="#" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
13
13
  {{ item.title }} <span class="bsk-caret"></span>
14
14
  </a>
15
15
  <ul class="bsk-dropdown-menu">
16
16
  {% for item in item.children %}
17
17
  <li {% if page.url == item.url %}class="bsk-active"{% endif %}>
18
- {% if page.url == item.url %}<span class="bsk-sr-only">(current)</span>{% endif %}
18
+ <!-- {% if page.url == item.url %}<span class="bsk-visually-hidden">(current)</span>{% endif %} -->
19
19
  <a href="{{ item.url }}">{{ item.title }}</a>
20
20
  </li>
21
21
  {% endfor %}
@@ -23,7 +23,7 @@
23
23
  </li>
24
24
  {% else %}
25
25
  <li {% if page.url == item.url %}class="bsk-active"{% endif %}>
26
- {% if page.url == item.url %}<span class="bsk-sr-only">(current)</span>{% endif %}
26
+ <!-- {% if page.url == item.url %}<span class="bsk-visually-hidden">(current)</span>{% endif %} -->
27
27
  <a href="{{ item.url }}">{{ item.title }}</a>
28
28
  </li>
29
29
  {% endif %}
data/_includes/bas-style-kit/bsk-nav-collapse--secondary-navigation.html CHANGED
@@ -1,9 +1,9 @@
1
1
  {% if site.menus.site_navigation_secondary %}
2
- <ul class="bsk-nav bsk-navbar-nav bsk-navbar-right">
2
+ <ul class="bsk-nav bsk-navbar-nav bsk-ms-auto">
3
3
  {% for item in site.menus.site_navigation_secondary %}
4
4
  {% if item.children %}
5
- <li class="bsk-dropdown">
6
- <a class="bsk-dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
5
+ <li class="bsk-nav-item bsk-dropdown">
6
+ <a class="bsk-dropdown-toggle" href="#" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
7
7
  {{ item.title }} <span class="bsk-caret"></span>
8
8
  </a>
9
9
  <ul class="bsk-dropdown-menu">
data/_includes/bas-style-kit/bsk-nav-header--brand.html CHANGED
@@ -1,4 +1,4 @@
1
- <a class="bsk-navbar-brand {% if site.bas_style_kit_jekyll_theme.attributes.site_brand.img %}bsk-navbar-brand-image-{{ site.bas_style_kit_jekyll_theme.attributes.site_brand.img_size }}{% endif %}" href="{{ site.bas_style_kit_jekyll_theme.attributes.site_brand.href }}">
1
+ <a class="bsk-navbar-brand{% if site.bas_style_kit_jekyll_theme.attributes.site_brand.img %}bsk-navbar-brand-image-{{ site.bas_style_kit_jekyll_theme.attributes.site_brand.img_size }}{% endif %}" href="{{ site.bas_style_kit_jekyll_theme.attributes.site_brand.href }}">
2
2
  {% if site.bas_style_kit_jekyll_theme.attributes.site_brand.img %}
3
3
  <img {% if site.bas_style_kit_jekyll_theme.attributes.site_brand.text %}class="bsk-fix-navbar-brand-img-txt"{% endif %} src="{{ site.bas_style_kit_jekyll_theme.attributes.site_brand.img }}">
4
4
  {% endif %}
data/_includes/bas-style-kit/bsk-nav-header--collapse-trigger.html CHANGED
@@ -1,6 +1,3 @@
1
- <button class="bsk-navbar-toggle bsk-collapsed" type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
2
- <span class="bsk-sr-only">Toggle navigation</span>
3
- <span class="bsk-icon-bar"></span>
4
- <span class="bsk-icon-bar"></span>
5
- <span class="bsk-icon-bar"></span>
6
- </button>
1
+ <button class="bsk-navbar-toggler bsk-ms-auto" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
2
+ <span class="bsk-navbar-toggler-icon"></span>
3
+ </button>
data/_layouts/bas-style-kit/bsk--standard-page.html CHANGED
@@ -3,20 +3,20 @@ layout: bas-style-kit/bsk--standard
3
3
  ---
4
4
 
5
5
  <div class="bsk-row">
6
- <div class="bsk-col-12-sm-12 bsk-col-12-md-9 bsk-col-12-xl-10 bsk-col-12-md-offset-3 bsk-col-12-xl-offset-2">
6
+ <div class="bsk-col-sm-12 bsk-col-md-9 bsk-col-xl-10 bsk-offset-md-3 bsk-offset-xl-2">
7
7
  {% include bas-style-kit/bsk-body--page-header.html %}
8
8
  </div>
9
9
  </div>
10
10
  <div class="bsk-row">
11
11
  {% if page.bas_style_kit_jekyll_theme.feature_flags.page.toc == true %}
12
- <div class="bsk-col-12-sm-12 bsk-col-12-md-3 bsk-col-12-lg-3 bsk-col-12-xl-2">
12
+ <div class="bsk-col-sm-12 bsk-col-md-3 bsk-col-lg-3 bsk-col-xl-2">
13
13
  <aside class="bsk-sidebar bsk-sidebar-default">
14
14
  <h2>Contents</h2>
15
15
  {% include bas-style-kit/bsk-body--toc.html %}
16
16
  </aside>
17
17
  </div>
18
18
  {% endif %}
19
- <div class="bsk-col-12-sm-12 bsk-col-12-md-9 bsk-col-12-xl-10 {% unless page.bas_style_kit_jekyll_theme.feature_flags.page.toc == true %}bsk-col-12-md-offset-3 bsk-col-12-xl-offset-2{% endunless %}">
19
+ <div class="bsk-col-sm-12 bsk-col-md-9 bsk-col-xl-10 {% unless page.bas_style_kit_jekyll_theme.feature_flags.page.toc == true %}bsk-col-offset-md-3 bsk-col-offset-xl-2{% endunless %}">
20
20
  {{ content }}
21
21
  </div>
22
22
  </div>
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.11.0
4
+ version: 0.12.1
5
5
  platform: ruby
6
6
  authors:
7
- - Felix Fennell
7
+ - baswebapps
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-03-17 00:00:00.000000000 Z
11
+ date: 2023-08-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: webrick
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '4.2'
33
+ version: 4.3.2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '4.2'
40
+ version: 4.3.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jekyll-data
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -72,45 +72,45 @@ dependencies:
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '0.2'
75
+ version: 0.2.2
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '0.2'
82
+ version: 0.2.2
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bundler
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '2.2'
89
+ version: '2.4'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '2.2'
96
+ version: '2.4'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rake
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 13.0.3
103
+ version: 13.0.6
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 13.0.3
110
+ version: 13.0.6
111
111
  description:
112
112
  email:
113
- - felnne@bas.ac.uk
113
+ - webapps@bas.ac.uk
114
114
  executables: []
115
115
  extensions: []
116
116
  extra_rdoc_files: []
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
190
190
  - !ruby/object:Gem::Version
191
191
  version: '0'
192
192
  requirements: []
193
- rubygems_version: 3.2.3
193
+ rubygems_version: 3.4.10
194
194
  signing_key:
195
195
  specification_version: 4
196
196
  summary: Jekyll theme for the BAS Style Kit