~xdavidwu/xdavidwu.link

a20b29dc39e0d21fd0f1dda3a441250123189e39 — Michael Rose 7 years ago 0fbb560 + 159912c
Merge branch 'ashmaroli-feature/jekyll-data'
3 files changed, 5 insertions(+), 2 deletions(-)

M CHANGELOG.md
M Rakefile
M minimal-mistakes-jekyll.gemspec
M CHANGELOG.md => CHANGELOG.md +1 -0
@@ 6,6 6,7 @@
- Add missing Spanish UI text strings. [#1118](https://github.com/mmistakes/minimal-mistakes/pull/1118)
- Update Susy to version 3 and rewrite grid CSS to be more readable.
- Refactor intro animations into a separate Sass variable `$intro-transition` to allow for customizing. [#1147](https://github.com/mmistakes/minimal-mistakes/pull/1147)
- Add [**jekyll-data**](https://github.com/ashmaroli/jekyll-data) as a dependency to read data files from theme-gem. [#1131]

### Bug Fixes


M Rakefile => Rakefile +1 -0
@@ 44,6 44,7 @@ task :preview do

  ENV["LISTEN_GEM_DEBUGGING"] = "1"
  listener = Listen.to(
    base.join("_data"),
    base.join("_includes"),
    base.join("_layouts"),
    base.join("_sass"),

M minimal-mistakes-jekyll.gemspec => minimal-mistakes-jekyll.gemspec +3 -2
@@ 12,14 12,15 @@ Gem::Specification.new do |spec|
  spec.metadata["plugin_type"] = "theme"

  spec.files                   = `git ls-files -z`.split("\x0").select do |f|
    f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i)
    f.match(%r{^(assets|_(data|includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i)
  end

  spec.add_runtime_dependency "jekyll", "~> 3.4"
  spec.add_runtime_dependency "jekyll", "~> 3.5", ">= 3.5.1"
  spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
  spec.add_runtime_dependency "jekyll-sitemap", "~> 1.0"
  spec.add_runtime_dependency "jekyll-gist", "~> 1.4"
  spec.add_runtime_dependency "jekyll-feed", "~> 0.9.2"
  spec.add_runtime_dependency "jekyll-data", "~> 1.0"
  spec.add_runtime_dependency "jemoji", "~> 0.8"

  spec.add_development_dependency "bundler", "~> 1.12"