jekyll-octopod 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8db2f57d31d171f21e326e3ac92bf8642f958db87f38c5bd8d40375b4b839671
-  data.tar.gz: 37fdf23887400278251eec91607e70f88e19916f32cb4dd62e9a7bfc36f8e4bd
+  metadata.gz: 7d33c0f33b30138d1e974e99cd5823ee64e35de94210b180b8d2fa5c34c5bece
+  data.tar.gz: d4e7c2abaf6ba064c022ed455b0ac077716bd6e36fbfd005b1d90b94c992c705
 SHA512:
-  metadata.gz: 89105dc41c40fc03e3ed92be9b542f322d9e17214fdc9eb00b6f664833a7f39c01a60f560256008affa1aab3193be8d2834e95e1758b9c58487acde8dcd223e4
-  data.tar.gz: b512219be5552762b4fe45364df66eb949a7e3a6d47d840c1230376191e60e97fa8532e4250aafd6751242875dfc9e67128b18d19ee0f846327976ac6d7aca58
+  metadata.gz: a66245f2206986d49d319fd4edd0384123cddcf5964229564c108ba35955c132af238ca8c55f52972a4926f6a997fea9442266a29efc439062854efde4c5e960
+  data.tar.gz: a21441985a2cdbfe4f2ebaa6571c6b2ad2fe1879e946781a0c8142aaafb42fc228689ee347665353b8763a1b60af1db53905c9b162419ab6d4f633aa53f7d374

data/assets/_sass/_overrides.scss

@@ -21,33 +21,51 @@ h1 small, h2 small, h3 small {
   font-size: 45%;
 }
 
-// Theme for the Swiss-Sided Dice podcast, red and white based on the Swiss flag - commented out for now, until a better solution can be found
-
-/*
-// Bulma's navbar reads its colors from CSS custom properties scoped on .navbar,
-// so a single block covers the background plus the hue/saturation/lightness
-// triple it derives hover, active and dropdown shading from - no separate
-// hover/toggle overrides needed the way Bootstrap required.
+// Example: give your site its own brand color instead of Bulma's default navbar. Bulma's navbar
+// reads its colors from CSS custom properties scoped on .navbar, so a single block covers the
+// background plus the hue/saturation/lightness triple it derives hover, active and dropdown
+// shading from. Swap the values below for your own color and delete this comment once you've
+// made it yours.
 .navbar {
-  --bulma-navbar-background-color: #E11A27;
-  --bulma-navbar-h: 356deg;
-  --bulma-navbar-s: 87%;
-  --bulma-navbar-l: 45%;
-  --bulma-navbar-item-color: #FFF;
-  --bulma-navbar-burger-color: #FFF;
+  --bulma-navbar-background-color: #48CFAD;
+  --bulma-navbar-h: 166deg;
+  --bulma-navbar-s: 48%;
+  --bulma-navbar-l: 55%;
+
+  // Without this, Bulma still colors the *currently active* nav item (a.navbar-item.is-active)
+  // from its own global --bulma-link-h/-s/-l default (a blue unrelated to the values above) instead
+  // of from this navbar's own hue/saturation/lightness - these four properties are what it actually
+  // reads for that state, so they need to be pointed at our own values too.
+  --bulma-navbar-item-selected-h: var(--bulma-navbar-h);
+  --bulma-navbar-item-selected-s: var(--bulma-navbar-s);
+  --bulma-navbar-item-selected-l: var(--bulma-navbar-l);
+  --bulma-navbar-item-selected-background-l: 40%;
+  --bulma-navbar-item-selected-color-l: 97%;
+}
+
+// The resting nav items' text color is Bulma's own --bulma-text-l, which is intentionally light
+// in dark mode (for contrast against the page's now-dark background) - but our navbar's own
+// background above is a literal color, so it doesn't darken with the rest of the page. Without
+// this, dark mode ends up with near-white text on a background that's still light-mode teal,
+// unreadable. Darkening the same hue/saturation here keeps the brand color recognizable while
+// giving Bulma's light dark-mode text something dark enough to actually contrast against.
+@media (prefers-color-scheme: dark) {
+  .navbar {
+    --bulma-navbar-background-color: #1B4B40;
+    --bulma-navbar-l: 20%;
+  }
 }
 
-// Links and buttons in the website are a dark red for best contrast, but get lightened on hover for feedback
+// Links and buttons in the website match the navbar, but get lightened on hover for feedback
 a {
-  color: #CF000F;
+  color: #48CFAD;
 }
 a:hover {
-  color: #EF3743;
+  color: #7BD1BD;
 }
 .button.is-primary {
-  background-color: #CF000F;
+  background-color: #48CFAD;
 }
 .button.is-primary:hover, .button.is-primary:focus {
-  background-color: #EF3743;
+  background-color: #7BD1BD;
 }
-*/

data/bin/octopod

@@ -2,7 +2,8 @@
 # require "byebug"
 PWD = Dir.pwd
 
-GEM_DIR = Gem::Specification.find_by_name("jekyll-octopod").gem_dir
+GEM_SPEC = Gem::Specification.find_by_name("jekyll-octopod")
+GEM_DIR = GEM_SPEC.gem_dir
 # HAS20170501 disgusting hack for development
 # GEM_DIR = "/home/user/jekyll/jekyll-octopod/"
 
@@ -28,6 +29,11 @@ Basic Command Line Usage:
   Additional Octopod commands:
     octopod episode                                           # adds a template for a new episode
     octopod deploy                                            # deploys your site
+    octopod update                                            # updates template files from an existing setup to
+                                                                # the currently installed jekyll-octopod version,
+                                                                # without touching posts, imprint.md or index.md,
+                                                                # and rewrites the old '{% podigee_player %}' tag
+                                                                # to '{% podlove_player %}' wherever it's still used
 
   See 'octopod <command> --help' for more information on a specific command.
 
@@ -110,7 +116,7 @@ def get_stdin(message)
   STDIN.gets.chomp
 end
 
-if ARGV.size > 0 && (ARGV[0] == 'episode' || ARGV[0] == 'deploy' || ARGV[0] == 'setup')
+if ARGV.size > 0 && (ARGV[0] == 'episode' || ARGV[0] == 'deploy' || ARGV[0] == 'setup' || ARGV[0] == 'update')
   options = YAML.load_file(File.join(PWD, '_config.yml'))
   options['posts_dir'] = File.join(PWD, '_posts')
 
@@ -271,6 +277,44 @@ if ARGV.size > 0 && (ARGV[0] == 'episode' || ARGV[0] == 'deploy' || ARGV[0] == '
       FileUtils.cp(GEM_DIR + "/assets/_config.yml.sample", PWD + "/_config.yml", verbose: true)
     end
     puts "===== ... done ===== ", ""
+
+  when 'update'
+    # Paths that are always left alone: real posts, hand-written content pages, and the gem's
+    # demo episode audio. Unlike 'setup', these are skipped outright rather than offered as a
+    # per-file prompt, since this command targets sites that are already live.
+    skip_on_update = %w[_posts imprint.md index.md episodes]
+
+    update_file = lambda do |file|
+      relative = file.split(GEM_DIR + "/assets")[1]
+      next if skip_on_update.any? { |skip| relative == "/#{skip}" || relative.start_with?("/#{skip}/") }
+      copy_file_or_create_dir(file)
+    end
+
+    puts "", "===== Updating template files to jekyll-octopod #{GEM_SPEC.version} ... ====="
+    puts "_posts/, imprint.md, index.md and the demo episodes/ directory are left untouched."
+    puts "You'll be asked before any other existing file gets overwritten.", ""
+
+    Dir.glob(GEM_DIR + "/assets/**/*").each(&update_file)
+    Dir.glob(GEM_DIR + "/assets/**/.*").each(&update_file)
+    puts "===== ... done ===== ", ""
+
+    puts "", "===== Rewriting the old '{% podigee_player %}' tag to '{% podlove_player %}' ... ====="
+    podigee_player_tag = /\{%-?\s*podigee_player\b.*?-?%\}/
+    updated_posts = Dir.glob(File.join(options['posts_dir'], '**', '*')).select do |post_file|
+      next false unless File.file?(post_file)
+      content = File.read(post_file)
+      next false unless content.match?(podigee_player_tag)
+      File.write(post_file, content.gsub(podigee_player_tag, '{% podlove_player %}'))
+      true
+    end
+
+    if updated_posts.empty?
+      puts "No posts used the old 'podigee_player' tag."
+    else
+      puts "Updated:"
+      updated_posts.each { |post_file| puts "  #{post_file}" }
+    end
+    puts "===== ... done ===== ", ""
   end
 else
   puts octopod_help if ARGV.size > 0 && ARGV[0] == '--help'

data/lib/octopod/version.rb

@@ -2,7 +2,7 @@ module Jekyll
   class Octopod
     module VERSION #:nodoc:
       MAJOR = 0
-      MINOR = 16
+      MINOR = 17
       TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-octopod
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Arne Eilermann