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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 857666e665b0c111fc76c3cc8e6fb6fe31901026d2cb3ca3934a43a3fa489040
-  data.tar.gz: 6fd109b6a4ade7f9eb8a3b6c92df36999683a5130603f30164f1e8b1309d3fd5
+  metadata.gz: e404d658a3f91feb04ae29162f681b4082c425574b72bbe6d4f1b60238f98dae
+  data.tar.gz: 6ce37c3dfd685038be4d96bb8682ad320862825a885e2704260a017070a14fc9
 SHA512:
-  metadata.gz: a8ff20ced3b6ff5f97266d91fe546108ed8c8a4918031285384515c61da8c4687107751a18881a6c87230fbcd0e425c61ca02ab41711b0fa1fc5f8c5e54b5e01
-  data.tar.gz: 529f1b50ecbcdd7b56a0cdb224a934d5a3ec8618f7ef312f02252767f2663578d28fb6e17bb89d3b571c68f8d30e2fa817945765d57082f2a3885bfcbe89cbae
+  metadata.gz: 16e5d2a9ad572a64f75aa8a9850ce476978e700c63c16f1463bbdc64d472e4da4bbcd9083cbf5c2434a8256871b2278c2fffbddfc532bbcf3d6515f13a7cc239
+  data.tar.gz: 5a9fd3db7ad3f922aa895e30c05d9572f4d753a2f76afd18ca14ad6ab62b01884aa8af2e97c2f452c87804112cfd22369aba38eb5fbbab654f6122128a52ec5f

data/CHANGELOG.md

@@ -5,6 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## [Unreleased][unreleased]
 
+## 0.12.0 - 2023-07-13
+
+### Added
+
+* Updated to Style Kit 0.7.0-alpha
+* Updated to jQuery 3.6.0
+* Updated to Jekyll 4.3.2
+
+### Removed
+
+* jQuery 
 ## 0.11.0 - 2021-03-17
 
 ### Added

data/README.md

@@ -735,7 +735,7 @@ After release:
 
 1. bump the version in:
   * `jekyll-theme-bas-style-kit.gemspec`
-  * `_data/bsk_jekyll_vars.json`
+  * `_data/bsk_jekyll_vars.json` - or here? `_data/bas-style-kit/bsk-vars.yml`
 2. build and push the app docker image [1]
 3. commit changes, merge with master and close release branch
 

data/_config.yml

@@ -6,6 +6,10 @@
 # Additional config options are defined using the Jekyll Data plugin, under the `site.data.bsk_jekyll_vars` namespace.
 # E.g. `site.data.bsk_jekyll_vars.bsk_attributes.bsk_version` gives the version of the BAS Style Kit this theme uses.
 
+webrick:
+  headers:
+    Access-Control-Allow-Origin: "*"
+
 # Plugins (required by this theme)
 #
 

data/_data/bas-style-kit/bsk-css.yml

@@ -1,5 +1,9 @@
 ---
 -
-    href: 'https://cdn.web.bas.ac.uk/bas-style-kit/0.6.1/css/bas-style-kit.min.css'
-    integrity: 'sha256-k05vjok9IGTMBJ8KYnQYX9sEc7A9eGWsTM8tQ2XqE8A='
+    href: 'https://fly-bas-style-kit.fly.dev/css/bas-style-kit.css'
+    # integrity: 'sha256-k05vjok9IGTMBJ8KYnQYX9sEc7A9eGWsTM8tQ2XqE8A='
     type: 'remote'
+-
+    # href: 'http://localhost:8043/develop/dist/css/bas-style-kit.css'
+    # integrity: 'sha256-k05vjok9IGTMBJ8KYnQYX9sEc7A9eGWsTM8tQ2XqE8A='
+    # type: 'remote'

data/_data/bas-style-kit/bsk-js.yml

@@ -1,13 +1,16 @@
 ---
 -
-    href: 'https://cdn.web.bas.ac.uk/libs/jquery/3.6.0/js/jquery-3.6.0.min.js'
-    integrity: 'sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4='
+    href: 'https://cdn.jsdelivr.net/gh/orestbida/cookieconsent@v2.8.9/dist/cookieconsent.js'
+    # integrity: 'need to add...'
     type: 'remote'
 -
-    href: 'https://cdn.web.bas.ac.uk/libs/js-cookie/2.2.1/js/js.cookie-2.2.1.min.js'
-    integrity: 'sha256-MdF5lmO7tgKSFNkLp9uc3HJfoCwW1LCQrdNyHkQji2s='
+    href: 'https://fly-bas-style-kit.fly.dev/js/bas-style-kit.js'
     type: 'remote'
+# -
+#     href: 'https://cdn.web.bas.ac.uk/bas-style-kit/0.6.0-beta/js/bas-style-kit.min.js'
+#     integrity: 'sha256-IGaRkrHf/T62GN0E75YL3iLtvmbifinJXfSo8GohRB0='
+#     type: 'remote'
 -
-    href: 'https://cdn.web.bas.ac.uk/bas-style-kit/0.6.1/js/bas-style-kit.min.js'
-    integrity: 'sha256-cW+jowQERFqjJwdZ1VSZgG7dXQly19ykM5kVIONXmFg='
-    type: 'remote'
+    # href: 'http://localhost:8043/develop/dist/js/bas-style-kit.js'
+    # integrity: 'sha256-cW+jowQERFqjJwdZ1VSZgG7dXQly19ykM5kVIONXmFg='
+    # type: 'local'

data/_data/bas-style-kit/bsk-vars.yml

@@ -1,3 +1,3 @@
 ---
-theme_version: "0.12.0"
-bsk_version: "0.6.1"
+theme_version: "0.14.0"
+bsk_version: "0.7.0-alpha"

data/_includes/bas-style-kit/bsk-body--back-to-top.html

@@ -1,2 +1,2 @@
 <div id="site-top"></div>
-<a class="bsk-sr-only bsk-sr-only-focusable" href="#site-content">Skip to main content</a> 
+<a class="bsk-visually-hidden-focusable" href="#site-content">Skip to main content</a> 

data/_includes/bas-style-kit/bsk-body--standard-footer.html

@@ -12,6 +12,7 @@
             {% endif %}
             {% include bas-style-kit/bsk-footer--contents.html %}
             {% if site.bas_style_kit_jekyll_theme.feature_flags.standard_footer.divider == true %}
+                <div class="bsk-clearfix"></div>
                 <div role="separator" class="bsk-footer-divider"></div>
             {% endif %}
             {% if site.bas_style_kit_jekyll_theme.feature_flags.standard_footer.governance == true %}

data/_includes/bas-style-kit/bsk-footer--back-to-top.html

@@ -1,3 +1,3 @@
-<div class="bsk-footer-back-to-top">
+<div class="bsk-footer-back-to-top bsk-float-end">
     <a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_back_to_top_target_href }}"> Back to top</a>
 </div>

data/_includes/bas-style-kit/bsk-footer--governance.html

@@ -1,4 +1,4 @@
-<div class="bsk-footer-governance">
+<div class="bsk-footer-governance bsk-float-start">
     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)
     <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>
     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

@@ -1,3 +1,3 @@
-<div class="bsk-footer-is-something-wrong">
+<div class="bsk-footer-is-something-wrong bsk-float-start">
     <a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_feedback_href }}" target="_blank">Is something wrong with this page?</a>
 </div>

data/_includes/bas-style-kit/bsk-footer--legal-policies.html

@@ -1,8 +1,8 @@
-<div class="bsk-footer-policy-links">
+<div class="bsk-footer-policy-links bsk-float-end">
     <ul class="bsk-list-inline">
-        <li><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.cookies_href }}"> Cookies</a></li>
-        <li><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.copyright_href }}"> Copyright</a></li>
-        <li><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.privacy_href }}"> Privacy</a></li>
+        <li class="bsk-list-inline-item"><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.cookies_href }}"> Cookies</a></li>
+        <li class="bsk-list-inline-item"><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.copyright_href }}"> Copyright</a></li>
+        <li class="bsk-list-inline-item"><a href="{{ site.bas_style_kit_jekyll_theme.attributes.site_footer.legal_policies.privacy_href }}"> Privacy</a></li>
     </ul>
     © {{site.time | date: "%Y"}} British Antarctic Survey
 </div>

data/_includes/bas-style-kit/bsk-header--site-navigation.html

@@ -1,4 +1,4 @@
-<nav class="bsk-navbar">
+<nav class="bsk-navbar bsk-navbar-expand-md bsk-navbar-dark bsk-bg-dark">
   <div class="{{ bsk_attributes_container_class }}">
     {% include bas-style-kit/bsk-nav--header.html %}
     {% include bas-style-kit/bsk-nav--collapse.html %}

data/_includes/bas-style-kit/bsk-nav--header.html

@@ -1,4 +1,4 @@
-<div class="bsk-navbar-header">
-    {% include bas-style-kit/bsk-nav-header--collapse-trigger.html %}
-    {% include bas-style-kit/bsk-nav-header--brand.html %}
-</div>
+
+{% include bas-style-kit/bsk-nav-header--brand.html %}
+{% include bas-style-kit/bsk-nav-header--collapse-trigger.html %}
+

data/_includes/bas-style-kit/bsk-nav-collapse--primary-navigation.html

@@ -8,14 +8,14 @@
                         {% assign is_active = true %}
                     {% endif %}
                 {% endfor %}
-                <li class="bsk-dropdown {% if is_active == true %}bsk-active{% endif %}">
-                    <a class="bsk-dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                <li class="bsk-nav-item bsk-nav-item bsk-dropdown {% if is_active == true %}bsk-active{% endif %}">
+                    <a class="bsk-dropdown-toggle bsk-nav-link" href="#" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
                         {{ item.title }} <span class="bsk-caret"></span>
                     </a>
                     <ul class="bsk-dropdown-menu">
                         {% for item in item.children %}
                             <li {% if page.url == item.url %}class="bsk-active"{% endif %}>
-                                {% if page.url == item.url %}<span class="bsk-sr-only">(current)</span>{% endif %}
+                                <!-- {% if page.url == item.url %}<span class="bsk-visually-hidden">(current)</span>{% endif %} -->
                                 <a href="{{ item.url }}">{{ item.title }}</a>
                             </li>
                         {% endfor %}
@@ -23,7 +23,7 @@
                 </li>
             {% else %}
                 <li {% if page.url == item.url %}class="bsk-active"{% endif %}>
-                    {% if page.url == item.url %}<span class="bsk-sr-only">(current)</span>{% endif %}
+                    <!-- {% if page.url == item.url %}<span class="bsk-visually-hidden">(current)</span>{% endif %} -->
                     <a href="{{ item.url }}">{{ item.title }}</a>
                 </li>
             {% endif %}

data/_includes/bas-style-kit/bsk-nav-collapse--secondary-navigation.html

@@ -1,9 +1,9 @@
 {% if site.menus.site_navigation_secondary %}
-    <ul class="bsk-nav bsk-navbar-nav bsk-navbar-right">
+    <ul class="bsk-nav bsk-navbar-nav bsk-ms-auto">
         {% for item in site.menus.site_navigation_secondary %}
             {% if item.children %}
-                <li class="bsk-dropdown">
-                    <a class="bsk-dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                <li class="bsk-nav-item bsk-dropdown">
+                    <a class="bsk-dropdown-toggle" href="#" data-bs-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
                         {{ item.title }} <span class="bsk-caret"></span>
                     </a>
                     <ul class="bsk-dropdown-menu">

data/_includes/bas-style-kit/bsk-nav-header--brand.html

@@ -1,4 +1,4 @@
-<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 }}">
+<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 }}">
     {% if site.bas_style_kit_jekyll_theme.attributes.site_brand.img %}
         <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 }}">
     {% endif %}

data/_includes/bas-style-kit/bsk-nav-header--collapse-trigger.html

@@ -1,6 +1,3 @@
-<button class="bsk-navbar-toggle bsk-collapsed" type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
-    <span class="bsk-sr-only">Toggle navigation</span>
-    <span class="bsk-icon-bar"></span>
-    <span class="bsk-icon-bar"></span>
-    <span class="bsk-icon-bar"></span>
-</button>
+<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">
+    <span class="bsk-navbar-toggler-icon"></span>
+</button>

data/_layouts/bas-style-kit/bsk--standard-page.html

@@ -3,20 +3,20 @@ layout: bas-style-kit/bsk--standard
 ---
 
 <div class="bsk-row">
-  <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">
+  <div class="bsk-col-sm-12 bsk-col-md-9 bsk-col-xl-10 bsk-offset-md-3 bsk-col-offset-xl-2">
     {% include bas-style-kit/bsk-body--page-header.html %}
   </div>
 </div>
 <div class="bsk-row">
   {% if page.bas_style_kit_jekyll_theme.feature_flags.page.toc == true %}
-    <div class="bsk-col-12-sm-12 bsk-col-12-md-3 bsk-col-12-lg-3 bsk-col-12-xl-2">
+    <div class="bsk-col-sm-12 bsk-col-md-3 bsk-col-lg-3 bsk-col-xl-2">
       <aside class="bsk-sidebar bsk-sidebar-default">
         <h2>Contents</h2>
         {% include bas-style-kit/bsk-body--toc.html %}
       </aside>
     </div>
   {% endif %}
-  <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 %}">
+  <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 %}">
     {{ content }}
   </div>
 </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-bas-style-kit
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
-- Felix Fennell
+- baswebapps
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2023-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.3.2
 - !ruby/object:Gem::Dependency
   name: jekyll-data
   requirement: !ruby/object:Gem::Requirement
@@ -72,45 +72,45 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
 description:
 email:
-- felnne@bas.ac.uk
+- webapps@bas.ac.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Jekyll theme for the BAS Style Kit