jekyll_patternbot 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c850baba774dbdd83ad62e944a74169f2e56885ffac8d09932005cc8ccd7b10
-  data.tar.gz: 6d8f1b4905396e1cef96504cabc02846688608e7a54489ee08afaddbf2a3a499
+  metadata.gz: 43ab1b44bc0d38e1c08d6adf0900166f6f98937a1dbeca6ed76e7f20e8651499
+  data.tar.gz: 57d298f8bf795cb01cb9c615d8c71e037f1e9c221ef28c357587d722631b5099
 SHA512:
-  metadata.gz: f0ac14d0cf87b8fac9a07d5d5666b4edbdd860a307666dcd41b590d389a231744bf365e19ebb1394241db710c046e27f39fd69e6b0dbcd6e815d08f436672283
-  data.tar.gz: 321ee6fd3360958c57209a1be3991fd1e70b9aecc46b1255f623d3d6edba1cde153449e12543e7c8b7bd239e70820a3ff8cb8c82884f04a57d368e40497f71f9
+  metadata.gz: '01028fb49ea3b1e562648b01c002d4aaeb538fd9e313740c6a40ab75ae3572caa57e0911666e7b3ea74e7914a706ed9f4204646d52d49ee170c10e1baa09da8e'
+  data.tar.gz: b00cd01acef476d6af955d121309ed61160ab7503586a83baf95ea96514b0625dcd939ad3485713151262c4c49a5aa753974893b0bb4034a0a94e4a4fb779fcf

data/CHANGELOG.md

@@ -5,7 +5,15 @@ Jekyll Patternbot adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## [1.6.3]
+## [1.6.4] — 2020-01-20
+
+### Fixed
+
+- Allow accent colours & fonts to show when there isn’t a primary.
+
+---
+
+## [1.6.3] — 2020-01-20
 
 ### Changed
 

data/_patterns/brand/colors.html

@@ -22,7 +22,9 @@
   {% endunless %}
 
   {% unless page._PatternbotData.css.theme.colors.accent == empty %}
-    {% assign show_hr = true %}
+    {% unless page._PatternbotData.css.theme.colors.primary == empty %}
+      {% assign show_hr = true %}
+    {% endunless %}
     {% include patternbot_pattern_brand_color_swatches.html style="small" title="Accent" key="accent" colors=page._PatternbotData.css.theme.colors.accent show_hr=show_hr %}
   {% endunless %}
 

data/_patterns/brand/typefaces.html

@@ -17,7 +17,9 @@
   {% endif %}
 
   {% for font in page._PatternbotData.css.theme.fonts.accent %}
-    {% assign show_hr = true %}
+    {% if page._PatternbotData.css.theme.fonts.primary %}
+      {% assign show_hr = true %}
+    {% endif %}
     {% include patternbot_pattern_brand_typeface.html title="Accent" key="accent" font=font desc=page._PatternbotConfig.patternbot.fonts.accent preposition="an" show_hr=show_hr %}
   {% endfor %}
 </div>

data/_plugins/jekyll_patternbot/processors/brand.rb

@@ -2,21 +2,51 @@ module JekyllPatternbot
   class BrandProcessor
 
     def remove_unless_colors
+      has_primary_colors = true
+      has_accent_colors = true
+
       begin PatternbotData.dig(:css, :theme, :colors, :primary)
         unless PatternbotData[:css][:theme][:colors][:primary].length > 0
-          PatternbotData[:patterns][:internal]['brand'][:config]['patterns'].delete 'colors'
+          has_primary_colors = false
         end
       rescue
+          has_primary_colors = false
+      end
+
+      begin PatternbotData.dig(:css, :theme, :colors, :accent)
+        unless PatternbotData[:css][:theme][:colors][:accent].length > 0
+          has_accent_colors = false
+        end
+      rescue
+          has_accent_colors = false
+      end
+
+      unless has_primary_colors or has_accent_colors
         PatternbotData[:patterns][:internal]['brand'][:config]['patterns'].delete 'colors'
       end
     end
 
     def remove_unless_typefaces
+      has_primary_typefaces = true
+      has_accent_typefaces = true
+
       begin PatternbotData.dig(:css, :theme, :fonts, :primary)
         unless PatternbotData.dig(:css, :theme, :fonts, :primary)
-          PatternbotData[:patterns][:internal]['brand'][:config]['patterns'].delete 'typefaces'
+          has_primary_typefaces = false
         end
       rescue
+        has_primary_typefaces = false
+      end
+
+      begin PatternbotData.dig(:css, :theme, :fonts, :accent)
+        unless PatternbotData.dig(:css, :theme, :fonts, :accent)
+          has_accent_typefaces = false
+        end
+      rescue
+        has_accent_typefaces = false
+      end
+
+      unless has_primary_typefaces or has_accent_typefaces
         PatternbotData[:patterns][:internal]['brand'][:config]['patterns'].delete 'typefaces'
       end
     end

data/version.rb

@@ -1,3 +1,3 @@
 module JekyllPatternbot
-  VERSION = '1.6.3'
+  VERSION = '1.6.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_patternbot
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Thomas J Bradley