diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index c4aefd055..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -name: "Enhancement / Feature Request" -about: "What would make this theme better?" ---- - - - -## Summary - - - -## Motivation - - - -## Drawbacks - - diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md deleted file mode 100644 index 843869d84..000000000 --- a/.github/ISSUE_TEMPLATE/support.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: "Question" -about: "Having trouble working with the theme?" ---- - - - diff --git a/.gitignore b/.gitignore index 5c4866d71..29cf10a32 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.sublime-workspace .bundle .DS_Store +.jekyll-cache .jekyll-metadata .sass-cache _asset_bundler_cache @@ -11,4 +12,4 @@ codekit-config.json example/_site Gemfile.lock node_modules -npm-debug.log* \ No newline at end of file +npm-debug.log* diff --git a/CHANGELOG.md b/CHANGELOG.md index a0e507120..bd7de6786 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,15 +5,34 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## [Unreleased] - + +### Fixed +- Add `relative_url` filter to author profile image. [#125](https://github.com/mmistakes/jekyll-theme-basically-basic/issues/125) +- Fix rake vulnerability in `.gemspec` file. + +## [1.4.4] - 2019-08-20 + +### Fixed +- Fix MIME-type issues with Lunr search by renaming `search-data.json` to `lunr/lunr.store.js`. [#82](https://github.com/mmistakes/jekyll-theme-basically-basic/issues/82) + +## [1.4.3] - 2019-08-20 + +### Changed +- Relax Jekyll dependency to allow for version 4.0. + +## [1.4.2] - 2019-07-18 ### Added - Document `site.copyright` override for customizing footer copyright text. ### Changed +- Update links to LICENSE. [#102](https://github.com/mmistakes/jekyll-theme-basically-basic/pull/102) - Update GitHub issue templates. ### Fixed +- Fix theme text strings for `search_placeholder_text` and `results_found`. [#104](https://github.com/mmistakes/jekyll-theme-basically-basic/issues/104) +- Remove stray `console.log` from lunr-search-scripts [#105](https://github.com/mmistakes/jekyll-theme-basically-basic/pull/105) - Add missing `/` in icon-gitlab.html. [#80](https://github.com/mmistakes/jekyll-theme-basically-basic/pull/80) ## [1.4.1] - 2018-08-07 diff --git a/README.md b/README.md index 30eb6062b..25cd3bdc2 100644 --- a/README.md +++ b/README.md @@ -161,7 +161,7 @@ site and you should something similar to: ``` {% include head.html %} diff --git a/_sass/basically-basic.scss b/_sass/basically-basic.scss index 2fb96605e..8fda22c27 100644 --- a/_sass/basically-basic.scss +++ b/_sass/basically-basic.scss @@ -1,5 +1,5 @@ /*! - * Basically Basic Jekyll Theme 1.4.1 + * Basically Basic Jekyll Theme 1.4.4 * Copyright 2017-2018 Michael Rose - mademistakes | @mmistakes * Free for personal and commercial use under the MIT license * https://github.com/mmistakes/jekyll-theme-basically-basic/blob/master/LICENSE diff --git a/assets/javascripts/search-data.json b/assets/javascripts/lunr/lunr.store.js similarity index 100% rename from assets/javascripts/search-data.json rename to assets/javascripts/lunr/lunr.store.js diff --git a/assets/javascripts/main.js b/assets/javascripts/main.js index 990a2dfc4..fa01c09be 100644 --- a/assets/javascripts/main.js +++ b/assets/javascripts/main.js @@ -2,10 +2,10 @@ --- /*! - * Basically Basic Jekyll Theme 1.4.1 + * Basically Basic Jekyll Theme 1.4.4 * Copyright 2017-2018 Michael Rose - mademistakes | @mmistakes * Free for personal and commercial use under the MIT license - * https://github.com/mmistakes/jekyll-basically-theme/blob/master/LICENSE + * https://github.com/mmistakes/jekyll-theme-basically-basic/blob/master/LICENSE */ var menuItems = document.querySelectorAll('#sidebar li'); diff --git a/docs/_config.yml b/docs/_config.yml index 7ae0171b7..b279107a1 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -18,7 +18,7 @@ repository: "mmistakes/minimal-mistakes" author: name: Dugan Nash twitter: Towlette_Pettetucci - picture: https://api.adorable.io/avatars/285/johndoe.png + picture: /assets/images/johndoe.png twitter_username: Towlette_Pettetucci github_username: Towlette_Pettetucci logo: /assets/icons/basically-basic-logo-light.svg diff --git a/docs/assets/images/johndoe.png b/docs/assets/images/johndoe.png new file mode 100644 index 000000000..0ed30c70f Binary files /dev/null and b/docs/assets/images/johndoe.png differ diff --git a/example/_config.yml b/example/_config.yml index 5592520a9..79818f03a 100644 --- a/example/_config.yml +++ b/example/_config.yml @@ -22,7 +22,7 @@ url: "" # the base hostname & protocol for your site, e.g. http://example.com author: name: Dugan Nash twitter: Towlette_Pettetucci - picture: https://api.adorable.io/avatars/285/johndoe.png + picture: /assets/images/johndoe.png twitter_username: Towlette_Pettetucci github_username: Towlette_Pettetucci logo: /assets/icons/basically-basic-logo-light.svg diff --git a/example/assets/images/johndoe.png b/example/assets/images/johndoe.png new file mode 100644 index 000000000..0ed30c70f Binary files /dev/null and b/example/assets/images/johndoe.png differ diff --git a/jekyll-theme-basically-basic.gemspec b/jekyll-theme-basically-basic.gemspec index 1e1fbbd61..ee0488600 100644 --- a/jekyll-theme-basically-basic.gemspec +++ b/jekyll-theme-basically-basic.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "jekyll-theme-basically-basic" - spec.version = "1.4.1" + spec.version = "1.4.4" spec.authors = ["Michael Rose"] spec.summary = %q{Your new Jekyll default theme.} @@ -15,12 +15,12 @@ Gem::Specification.new do |spec| f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i) end - spec.add_runtime_dependency "jekyll", "~> 3.7" - spec.add_runtime_dependency "jekyll-feed", "~> 0.10" + spec.add_runtime_dependency "jekyll", ">= 3.6", "< 5.0" + spec.add_runtime_dependency "jekyll-feed", "~> 0.1" spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" - spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.5" - spec.add_runtime_dependency "jekyll-sitemap", "~> 1.2" + spec.add_runtime_dependency "jekyll-seo-tag", "~> 2.6" + spec.add_runtime_dependency "jekyll-sitemap", "~> 1.3" - spec.add_development_dependency "bundler", "~> 1.15" - spec.add_development_dependency "rake", "~> 10.0" + spec.add_development_dependency "bundler" + spec.add_development_dependency "rake", ">= 12.3.3" end