bulmatown 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 491df0f4017115c834e573c2dbe73c9a4b7b06b723f68a5fec4528f241d67ee6
-  data.tar.gz: f64c37e0dd7372f115a3136c18431ffc9d1d72a319ef02ac005afe97a80e2780
+  metadata.gz: 0cf33656582634a453a7e2119a081162519d60f7f6e7d3869a2df20737d8ab8c
+  data.tar.gz: 25cd31c1d7eeb1147d4bec23a24b6fddf9988c1536cb4c98a44371a6bb6a010d
 SHA512:
-  metadata.gz: ada1ec76386a705994c49455f0630fde74977cba340db71ea1248a4a37441b5a45b225fb8bb85ef55eafdf1c0e6176e07e2fc1a3f3558183f8214eec40f40abc
-  data.tar.gz: 313896cf57d651b83f1abf8355288ca40cabcd173c464170d9cd101ae1b4491faa045dbef93b024691555d0351de116febcb91bd4291643e5e57c22df881c82b
+  metadata.gz: dd1a8720b2e838b6e67d2742e9e642bd6c3dffcd59288c07e8f4165f9aa67cb4da203d5a19643b15d8d98a6fbe3f5fbc481c002433f0d9f5ddbe380c54f530cd
+  data.tar.gz: 0ee7fac751358286b63c588bd14f82775b410d68003eb5b010593d217bf83724f815c5d55236101d652e4d5665f9429b4d6048969b19176591d62ec4c81e3827

data/bridgetown.automation.rb

@@ -1,8 +1,17 @@
+# Thanks to https://github.com/ParamagicDev for a bunch of the smarts in this
+# automation :)
+
 add_bridgetown_plugin "bulmatown"
 add_bridgetown_plugin "bridgetown-quick-search"
-add_yarn_for_gem "bulmatown"
+
+# 0.15 bug! :( can't use this:
+#add_yarn_for_gem "bulmatown"
+
+gem_version = (`bundle info bulmatown`).match(/\*.*\((.*?)\)/)[1]
+run "yarn add bulmatown@#{gem_version}"
 
 require 'fileutils'
+require 'shellwords'
 
 unless Dir.exist? "frontend/fonts"
   FileUtils.mkdir_p "frontend/fonts"
@@ -12,18 +21,76 @@ run "cp node_modules/fork-awesome/fonts/* frontend/fonts"
 
 javascript_import 'import Bulmatown from "bulmatown"'
 
-if ask "The Bulmatown theme can update layout and page templates in your site to use the theme. Would you like to continue?"
-  layout_tmpl = ->(tmpl_name) do
-    <<~HTML
-      ---
-      layout: bulmatown/#{tmpl_name}
-      ---
-      
-      {{ content }}
-    HTML
+# *** Set up remote repo pull
+
+# Dynamically determined due to having to load from the tempdir
+@current_dir = File.expand_path(__dir__)
+
+# If its a remote file, the branch is appended to the end, so go up a level
+ROOT_PATH = if __FILE__ =~ %r{\Ahttps?://}
+              File.expand_path('../', __dir__)
+            else
+              File.expand_path(__dir__)
+            end
+
+DIR_NAME = File.basename(ROOT_PATH)
+
+# DIR_NAME = 'bulmtatown'
+GITHUB_PATH = "https://github.com/whitefusionhq/#{DIR_NAME}.git"
+
+# Copied from: https://github.com/mattbrictson/rails-template
+# Add this template directory to source_paths so that Thor actions like
+# copy_file and template resolve against our source files. If this file was
+# invoked remotely via HTTP, that means the files are not present locally.
+# In that case, use `git clone` to download them to a local temporary dir.
+def add_template_repository_to_source_path
+  if __FILE__ =~ %r{\Ahttps?://}
+    require 'tmpdir'
+
+    source_paths.unshift(tempdir = Dir.mktmpdir(DIR_NAME + '-'))
+    at_exit { FileUtils.remove_entry(tempdir) }
+    run("git clone --quiet #{GITHUB_PATH.shellescape} #{tempdir.shellescape}")
+
+    if (branch = __FILE__[%r{#{DIR_NAME}/(.+)/bridgetown.automation.rb}, 1])
+      Dir.chdir(tempdir) { system("git checkout #{branch}") }
+      @current_dir = File.expand_path(tempdir)
+    end
+  else
+    source_paths.unshift(DIR_NAME)
   end
-  create_file "src/_layouts/home.html", layout_tmpl(:home)
-  create_file "src/_layouts/page.html", layout_tmpl(:page)
-  create_file "src/_layouts/post.html", layout_tmpl(:post)
+end
 
+if yes? "The Bulmatown installer can update styles, layouts, and page templates to use the new theme. You'll have the option to type 'a' to overwrite all existing files or 'd' to inspect each change. Would you like to proceed? (Y/N)"
+  add_template_repository_to_source_path
+
+  create_file "frontend/styles/index.scss", '@import "~bulmatown/frontend/styles"'
+  
+  copy_file "example/src/_layouts/home.html", "src/_layouts/home.html"
+  copy_file "example/src/_layouts/page.html", "src/_layouts/page.html"
+  copy_file "example/src/_layouts/post.html", "src/_layouts/post.html"
+
+
+  gsub_file "src/_layouts/default.html", '{% render "footer", ', '{% render "footer", url: site.url, '
+
+  copy_file "example/src/index.md", "src/index.md"
+  copy_file "example/src/posts.md", "src/posts.md"
+  copy_file "example/src/404.html", "src/404.html"
+  
+  copy_file "example/src/_components/navbar.liquid", "src/_components/navbar.liquid"
+  copy_file "example/src/_components/footer.liquid", "src/_components/footer.liquid"
+
+  inject_into_file "bridgetown.config.yml", "pagination:\n  enabled: true\n", after: "permalink: pretty\n"
 end
+
+twitter = ask "Do you have a Twitter handle? If so, enter it here, otherwise type 'no'"
+
+if twitter != "" && twitter != "no"
+  append_to_file "src/_data/site_metadata.yml" do
+    <<~YAML
+      twitter: #{twitter}
+
+    YAML
+  end
+end
+
+say_status :bulmatown, "Theme installation complete! Enjoy your fresh new design :)"

data/components/bulmatown/hero.scss

@@ -21,6 +21,15 @@ $gradient-bottom-right: transparentize(lighten(saturate(adjust-hue($dark, 10deg)
     background-image: linear-gradient(141deg, var(--overlay-top-left) 0%, var(--overlay-center) 65%, var(--overlay-bottom-right) 100%);
   }
 
+  .container.is-fluid {
+    @include mobile {
+      margin-left: 0;
+      margin-right: 0;
+      padding-left: 0;
+      padding-right: 0;
+    }
+  }
+
   .title {
     text-shadow: 0px 2px 3px transparentize($black, 0.5);
   }

data/example/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "bridgetown-quick-search": "^1.0.3",
-    "bulmatown": "^1.0.0"
+    "bulmatown": "1.0.3"
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",

data/example/src/404.html

@@ -1,9 +1,8 @@
 ---
 permalink: /404.html
-layout: default
+layout: page
+title: 404 Not Found
 ---
 
-<h1>404</h1>
-
 <p><strong>Page not found :(</strong></p>
 <p>The requested page could not be found.</p>

data/example/src/posts.md

@@ -1,6 +1,7 @@
 ---
 layout: page
 title: Articles
+exclude_from_search: true
 pagination:
   enabled: true
 ---

data/example/yarn.lock

@@ -1534,9 +1534,9 @@ bulma@^0.9:
   integrity sha512-rV75CJkubNUroAt0qCRkjznZLoaXq/ctfMXsMvKSL84UetbSyx5REl96e8GoQ04G4Tkw0XF3STECffTOQrbzOQ==
 
 bulmatown@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bulmatown/-/bulmatown-1.0.1.tgz#6fde191351b8a29ee7ad679ff2d234414d1bf898"
-  integrity sha512-DH77Xps8EFTuATWTnTQWb1qfknqOuz/mdZ78rQpSleQnMBNY7S/h9C2qc7BuO2ryUSzdv4/WhxklBhAY1PhN5g==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/bulmatown/-/bulmatown-1.0.2.tgz#d791813163eb51dbd44c86782545cb8500f47931"
+  integrity sha512-2tPbxIDhi/LSHO6QZP24Jnt/3cAe8fGKb8ArAEjXI9zeiPCgbbj/x56bQc221PgHCC5dbavp/NsNm5wgxUKPRA==
   dependencies:
     bridgetown-quick-search "^1.0.3"
     bulma "^0.9"

data/lib/bulmatown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bulmatown
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bulmatown",
   "description": "A Bulma CSS starter theme for Bridgetown",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "main": "frontend/javascript/index.js",
   "repository": {
     "type": "git",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulmatown
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jared White
@@ -186,7 +186,7 @@ homepage: https://github.com/whitefusionhq/bulmatown
 licenses:
 - MIT
 metadata:
-  yarn-add: bulmatown@1.0.2
+  yarn-add: bulmatown@1.0.3
 post_install_message: 
 rdoc_options: []
 require_paths: