jekyll-scouts_uk_2018 1.1.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e35ad34280ba04bb31284f42eea6366ddaeaab5f46c20b19874d96713058d793
-  data.tar.gz: 77e08e51dc4d5ea7072c5eab051e25b7b339949a48490b6bbbb88ae8c04cad3a
+  metadata.gz: 0a45ffb25cd0be5a5474e1f6b8f57091087fcf929dc1ade3021baa2a9a0dc99e
+  data.tar.gz: a72463c1f419e35220dcdf84e5d22c5d41129186c42793e434aaee2d4b9a151a
 SHA512:
-  metadata.gz: 2a706e8efe06807a75b13238d7de6c1ec7d01ae0abb7ce7c04d5e0a2027a52a22e4f1aa9136c896d4e97c9e2940c9a2517920efec779d47184ec9e2c5edba563
-  data.tar.gz: 5a33afe9f6810984a3928739b31cbd7c94dfd257938a85372fd7e4a6e17f55ffb896e59b92853f0482054335c2a67e5ce46033b055322a01b1d780a208f20f7d
+  metadata.gz: f19b6f37528c81069096f8398f9e10bcb297a9cd6cd25f571a50df460a58e95f263eeca29a0c3dfaf0e3d94dd5c063b5af69d618e7ed33b4e6a05e05f3717e72
+  data.tar.gz: d5b1ac031c00d506e16b141f2bf616a93268301542721d1f22646a84db9e67017ce4977d3b0d2dadf98b628dd8a1dad027d03dee32a65cc7c1c32c7ac6866551

data/README.md

@@ -8,7 +8,7 @@ A [Jekyll](https://jekyllrb.com/) template for the UK Scouts brand (2018). You c
 Add this line to your Jekyll site's Gemfile:
 
 ```ruby
-gem 'jekyll-scouts_uk_2018', '~> 1.1'
+gem 'jekyll-scouts_uk_2018', '~> 1.3', group: 'jekyll_plugins'
 ```
 
 And add this line to your Jekyll site's _config.yml:
@@ -81,9 +81,7 @@ defaults:
 
 Then create your files in the _sections directory. A number of front matter settings are available:
 * title:
-* type: squirrels / beavers / cubs / scouts / explorers / network / activesupport - causes the correct logo to be shown
-* logo_type: (only for squirrels) primary / symbol
-* logo_colour: black / white / (others that vary by section e.g. blue / colourful for beavers, green for cubs / scouts)
+* type: squirrels / beavers / cubs / scouts / explorers / network / activesupport
 * youth_approved.level: foundation / bronze (causes the relevant seal to be displayed)
 * youth_approved.expires: date of certificate expiry in YYYY-MM-DD format.
 * social_links.email
@@ -98,12 +96,44 @@ Then create your files in the _sections directory. A number of front matter sett
 
 ### Other things you get
 
+#### Included Tags
+
+The gem **MUST** be in the jekyll_plugins group to use the included tags.
+
+##### youth_approved
+
+```
+{% youth_approved %}
+```
+Will render an image of [Scout Scotland's Youth Approved](https://www.scouts.scot/members/youth-involvement/youth-approved-award/) seal, with the level chosen by:
+
+* The value of the youth_approved.level front matter
+* The generic Youth Approved logo
+
+If the frontmatter youth_approved.expires is present and in the past then nothing will be rendered.
+
+```
+{% youth_approved <level> %}
+```
+Will render an image of Scout Scotland's Youth Approved seal at the passed level.
+
+```
+{% youth_approved <level> <expires> %}
+```
+Will render an image of Scout Scotland's Youth Approved seal at the passed level if the passed expires (format YYYY-MM-DD) has not passed.
+
+In all cases the img has a class of youth-approved-seal and is enclosed by a link to the scheme on Scouts Scotland's website.
+
 #### Ability to display twitter content (provided by [jekyll-twitter-plugin](https://github.com/rob-murray/jekyll-twitter-plugin))
 
 If a section has a social_links.twitter value and the screen is wide enough then their last five tweets will be displayed at the side of the page.
 #### Basic search engine optimisation (provided by [jekyll-seo-tag](https://github.com/jekyll/jekyll-seo-tag))
 
-#### Selection of images
-* Look in assets/images/logos
+#### Selection of images/assets
+* Logos: assets/images/logos
+  * Sections and Active Support
+  * Linear / Stacked
+  * FleurDeLis
 * [Tabler icons](https://tablericons.com/): assets/images/tabler-icons-sprite.svg
 * Scouts Scotland's Youth Approved seals: assets/images
+* Nunito Sans font: assets/fonts/NunitoSans

data/_includes/head.html

@@ -3,5 +3,4 @@
   {%- seo -%}
   <link rel="stylesheet" href="{{ "/assets/css/main.css" | relative_url }}">
   <link rel="icon" type="image/x-icon" href="{{ "/assets/favicon.ico" | relative_url }}">
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Nunito+Sans:400,700,900">
 </head>

data/_includes/header.html

@@ -1,6 +1,6 @@
 <header class="layout-{{ page.layout }}">
   <div id="header-logo">
-    <a href="{{ "/" | relative_url }}">
+    <a href="{{ "/" | relative_url }}" title="{{ site.name | escape }}">
       {%- include header-logo.html -%}
     </a>
   </div>

data/_layouts/section.html

@@ -6,54 +6,8 @@ main_class: section
 <div id="content">
   <div id="content-header">
     <h1>
-      {%- assign logo = page.type | capitalize -%}
-      {%- case page.type | downcase -%}
-        {%- when "squirrels" -%}
-          {%- assign type =  page.logo_type | default: "primary" | capitalize -%}
-          {%- assign colour = page.logo_colour | default: "red" | capitalize -%}
-          {%- if type == "Symbol" -%}
-            {%- assign widths = "100" -%}
-          {%- endif -%}
-        {%- when "beavers" -%}
-          {%- assign colour = page.logo_colour | default: "blue" | capitalize -%}
-        {%- when "cubs" -%}
-          {%- assign colour = page.logo_colour | default: "green" | capitalize -%}
-          {%- assign widths = "100,320,480,640" -%}
-        {%- when "scouts" -%}
-          {%- assign colour = page.logo_colour | default: "green" | capitalize -%}
-        {%- when "explorers" -%}
-          {%- assign colour = page.logo_colour | default: "blue" | capitalize -%}
-        {%- when "network" -%}
-          {%- assign widths = "100,320,480" -%}
-        {%- when "activesupport" -%}
-          {%- if logo == "Activesupport" -%}
-            {%- assign logo = "ActiveSupport" -%}
-          {%- endif -%}
-        {%- else -%}
-          {%- assign colour = page.logo_colour | default: "black" | capitalize -%}
-      {%- endcase -%}
-      {%- assign path = "assets/images/logos/" | append: logo | append: type | append: colour | relative_url -%}
-      {%- assign widths = widths | default: "100,320,480,640,800" | split: "," -%}
-      {%- capture srcset -%}
-        {%- for i in widths -%}
-          {{ path }}-{{ i }}.png {{ i }}w,
-        {%- endfor -%}
-      {%- endcapture -%}
-      <img src="{{ path }}.png" srcset="{{ srcset }}" alt="{{ page.type }}" loading="eager">
+      {{ page.title | escape }}
     </h1>
-
-    {%- if page.youth_approved -%}
-      {%- assign today = 'now' | date: '%Y-%m-%d' -%}
-      {%- assign expires = page.youth_approved.expires | date: '%Y-%m-%d' -%}
-      {%- if expires >= today -%}
-        <a href="https://www.scouts.scot/members/youth-involvement/youth-approved-award/" rel="nofollow noopener" target="_blank" class="youth-approved">
-          {%- assign logo = page.youth_approved.level | capitalize -%}
-          {%- assign logo = "assets/images/YouthApproved" | append: logo | relative_url -%}
-          {%- assign alt = "We've got the " | append: page.youth_approved.level | append: " Youth Approved award from Scouts Scotland." -%}
-          <img src="{{ logo }}.png" srcset="{{ logo }}-100.png 100w, {{ logo }}-320.png 320w, {{ logo }}-480.png 480w, {{ logo }}-640.png 640w" alt="{{ alt }}">
-        </a>
-        {%- endif -%}
-    {%- endif -%}
   </div>
 
 
@@ -64,12 +18,13 @@ main_class: section
   <div id="content-footer">
     {%- assign social_links = page.social_links -%}
     {%- include social-links.html -%}
+    {%- if page.youth_approved -%}{% youth_approved %}{%- endif -%}
   </div>
 </div>
 
 {%- if page.social_links.twitter -%}
   <div id="tweets">
     {% assign twitter_url = 'https://twitter.com/' | append: page.social_links.twitter %}
-    {% twitternocache twitter_url limit=3 %}
+    {% twitter twitter_url limit=3 %}
   </div>
 {%- endif -%}

data/_sass/sections.scss

@@ -3,29 +3,28 @@ main.layout-section {
   flex-direction: row;
 
   #content {
-    #content-header {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-
-      h1 {
-        margin: 0;
-      }
-
-      img {
-        max-width: 20rem;
-        max-height: 10rem;
-      }
-    }
-
     #content-body {
       max-width: 45rem;
     }
 
     #content-footer {
       display: flex;
-      justify-content: space-between;
-      align-items: center;
+      flex-wrap: wrap;
+      justify-content: space-around;
+      align-items: flex-start;
+
+      .youth-approved-seal {
+        max-width: 10rem;
+      }
+
+      @media screen and (max-width: 32rem) {
+        flex-direction: column;
+        align-items: center;
+
+        .youth-approved-seal {
+          max-width: 7.5rem;
+        }
+      }
     }
   }
 
@@ -41,27 +40,3 @@ main.layout-section {
     display: none;
   }
 }
-
-@media screen and (max-width: 40rem) {
-  main.layout-section {
-    #content {
-      #content-header {
-        img {
-          max-width: 15rem;
-        }
-      }
-    }
-  }
-}
-
-@media screen and (max-width: 30rem) {
-  main.layout-section {
-    #content {
-      #content-header {
-        img {
-          max-width: 10rem;
-        }
-      }
-    }
-  }
-}

data/assets/css/main.scss

@@ -23,8 +23,33 @@
   --text-color: var(--scout-black);
 }
 
+@font-face {
+  font-family: 'Nunito Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: url({{ "assets/fonts/NunitoSans/NunitoSans-Regular.ttf" | relative_url}});
+}
+@font-face {
+  font-family: 'Nunito Sans';
+  font-style: italic;
+  font-weight: 400;
+  src: url({{ "assets/fonts/NunitoSans/NunitoSans-Italic.ttf" | relative_url}});
+}
+@font-face {
+  font-family: 'Nunito Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: url({{ "assets/fonts/NunitoSans/NunitoSans-Black.ttf" | relative_url}});
+}
+@font-face {
+  font-family: 'Nunito Sans';
+  font-style: italic;
+  font-weight: 700;
+  src: url({{ "assets/fonts/NunitoSans/NunitoSans-BlackItalic.ttf" | relative_url}});
+}
+
 html {
-  font-family: "Nunito Sans", Arial, sans-serif;
+  font-family: 'Nunito Sans', Arial, sans-serif;
   scroll-behavior: smooth;
 }
 
@@ -87,6 +112,10 @@ img {
   margin: 0;
 }
 
+img.photo {
+  border-radius: 1.25rem;
+}
+
 figure > img {
   display: block;
 }
@@ -129,6 +158,10 @@ ul.social-links {
   }
 }
 
+.youth-approved-seal {
+  max-width: 20rem;
+}
+
 
 @import "header";
 

data/assets/fonts/NunitoSans/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2016 The Nunito Sans Project Authors (https://github.com/Fonthausen/NunitoSans)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

data/lib/jekyll-scouts_uk_2018/tag.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Jekyll
+  module ScoutsUk2018
+    class Tag < Liquid::Tag
+      def initialize(_tag_name, markup, _parse_context)
+        super
+
+        @level, @expires = markup.strip.split(/\s+/, 2)
+      end
+
+      def render(context)
+        expires = @expires || context.registers[:page]['youth_approved']&.[]('expires')
+        return if expires && expires.to_s < Date.today.to_s
+        level = @level || context.registers[:page]['youth_approved']&.[]('level')
+
+        logo = "#{context.registers[:site].config.fetch('baseurl', '').to_s.chomp('/')}/assets/images/YouthApproved#{level&.capitalize}"
+        alt = if level
+          "We've got the #{level.capitalize} Youth Approved award from Scouts Scotland."
+        else
+          "Scouts Scotland's Youth Approved award."
+        end
+
+        html = <<~__HTML__
+          <a href="https://www.scouts.scot/members/youth-involvement/youth-approved-award/" rel="nofollow noopener" target="_blank">
+            <img
+              class="youth-approved-seal"
+              src="#{logo}.png"
+              srcset="#{logo}-100.png 100w,
+                      #{logo}-320.png 320w,
+                      #{logo}-480.png 480w,
+                      #{logo}-640.png 640w"
+              alt="#{alt}"
+            >
+          </a>
+        __HTML__
+        html.gsub(/\s+\>/, '>').gsub(/\s+\</, '<').gsub(/\s+/, ' ')
+      end
+    end
+  end
+end

data/lib/jekyll-scouts_uk_2018.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'jekyll-scouts_uk_2018/tag'
+
+module Jekyll
+  module ScoutsUk2018
+  end
+end
+
+
+Liquid::Template.register_tag('youth_approved', Jekyll::ScoutsUk2018::Tag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-scouts_uk_2018
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Robert Gauld
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -61,7 +61,6 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- _config.yml
 - _includes/footer.html
 - _includes/head.html
 - _includes/header-logo.html
@@ -78,6 +77,21 @@ files:
 - _sass/sections.scss
 - assets/css/main.scss
 - assets/favicon.ico
+- assets/fonts/NunitoSans/NunitoSans-Black.ttf
+- assets/fonts/NunitoSans/NunitoSans-BlackItalic.ttf
+- assets/fonts/NunitoSans/NunitoSans-Bold.ttf
+- assets/fonts/NunitoSans/NunitoSans-BoldItalic.ttf
+- assets/fonts/NunitoSans/NunitoSans-ExtraBold.ttf
+- assets/fonts/NunitoSans/NunitoSans-ExtraBoldItalic.ttf
+- assets/fonts/NunitoSans/NunitoSans-ExtraLight.ttf
+- assets/fonts/NunitoSans/NunitoSans-ExtraLightItalic.ttf
+- assets/fonts/NunitoSans/NunitoSans-Italic.ttf
+- assets/fonts/NunitoSans/NunitoSans-Light.ttf
+- assets/fonts/NunitoSans/NunitoSans-LightItalic.ttf
+- assets/fonts/NunitoSans/NunitoSans-Regular.ttf
+- assets/fonts/NunitoSans/NunitoSans-SemiBold.ttf
+- assets/fonts/NunitoSans/NunitoSans-SemiBoldItalic.ttf
+- assets/fonts/NunitoSans/OFL.txt
 - assets/images/YouthApproved-100.png
 - assets/images/YouthApproved-320.png
 - assets/images/YouthApproved-480.png
@@ -287,6 +301,8 @@ files:
 - assets/images/logos/SquirrelsSymbolYellow-100.png
 - assets/images/logos/SquirrelsSymbolYellow.png
 - assets/images/tabler-icons-sprite.svg
+- lib/jekyll-scouts_uk_2018.rb
+- lib/jekyll-scouts_uk_2018/tag.rb
 homepage: https://github.com/27thAberdeenScoutGroup/jekyll-scouts_uk_2018
 licenses:
 - BSD-3-Clause