Homework

.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*
+npm-debug.log*

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

README.md

@@ -161,7 +161,7 @@ site and you should something similar to:
 
 ```
 <!--
-    Basically Basic Jekyll Theme 1.2.0
+    Basically Basic Jekyll Theme 1.4.4
     Copyright 2017-2018 Michael Rose - mademistakes.com | @mmistakes
     Free for personal and commercial use under the MIT license
     https://github.com/mmistakes/jekyll-basically-theme/blob/master/LICENSE
@@ -351,6 +351,10 @@ t:
   skip_content: "Skip to content"
   skip_footer: "Skip to footer"
   menu: "Menu"
+  search: "Search"
+  site_search: "Site Search"
+  results_found: "Result(s) found"
+  search_placeholder_text: "Enter your search term..."
   home: "Home"
   newer: "Newer"
   older: "Older"

_config.yml

@@ -13,10 +13,10 @@
 # you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
 # You can create any custom variable you would like, and they will be accessible
 # in the templates via {{ site.myvariable }}.
-lang: en-US
-title: My Awesome Site
+lang: zh-CN
+title: 梁健伟的website
 email:
-description:
+description: Jekyll
 baseurl: # the optional subpath of your site, e.g. "/blog"
 url: # the base hostname & protocol for your site e.g. "https://mmistakes.github.io"
 author:

_includes/author

@@ -16,8 +16,8 @@
     {% if site.data.authors and site.data.authors[author] %}
       {% assign author_picture = site.data.authors[author].picture %}
     {% endif %}
-    {% unless author_picture contains '://' %}{% assign author_picture = author_picture | relative_url %}{% endunless %}
   {% endif %}
+  {% assign author_picture = author_picture | relative_url %}
 
   {% if author.twitter %}
     {% assign author_twitter = author.twitter %}
@@ -28,4 +28,4 @@
       {% assign author_twitter = site.twitter_username %}
     {% endif %}
   {% endif %}
-{% endif %}
+{% endif %}

_includes/search-form.html

@@ -4,7 +4,7 @@
     {%- case search_provider -%}
       {%- when "lunr" -%}
         <label class="visually-hidden" for="search">{{ site.data.theme.t.site_search | default: 'Site Search' }}</label>
-        <input type="text" id="search" class="search-input" aria-describedby="results-count" tabindex="-1" placeholder="{{ site.data.theme.t.menu.search_placeholder_text | default: 'Enter your search term...' }}" />
+        <input type="text" id="search" class="search-input" aria-describedby="results-count" tabindex="-1" placeholder="{{ site.data.theme.t.search_placeholder_text | default: 'Enter your search term...' }}" />
         <div id="results" class="results"></div>
       {%- when "algolia" -%}
         <div tabindex="-1" class="search-searchbar"></div>

_includes/search/algolia-search-scripts.html

@@ -35,7 +35,7 @@ <h3 class="entry-title"><a href="{{ site.baseurl }}${url}">${title}</a></h3>
   instantsearch.widgets.searchBox({
     container: '.search-searchbar',
     {% unless site.algolia.powered_by == false %}poweredBy: true,{% endunless %}
-    placeholder: '{{ site.data.theme.t.menu.search_placeholder_text | default: "Enter your search term..." }}'
+    placeholder: '{{ site.data.theme.t.search_placeholder_text | default: "Enter your search term..." }}'
   })
 );
 search.addWidget(

_includes/search/lunr-search-scripts.html

@@ -37,7 +37,7 @@
   {%- endcase -%}
   <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
   <script src="{{ '/assets/javascripts/lunr/lunr.min.js' | absolute_url }}"></script>
-  <script src="{{ '/assets/javascripts/search-data.json' | absolute_url }}"></script>
+  <script src="{{ '/assets/javascripts/lunr/lunr.store.js' | absolute_url }}"></script>
   {%- unless lang == "en" -%}
     <script src="{{ '/assets/javascripts/lunr/lunr.stemmer.support.min.js' | absolute_url }}"></script>
     <script src="{{ '/assets/javascripts/lunr/lunr.' | append: lang | append: '.min.js' | absolute_url }}"></script>
@@ -69,8 +69,6 @@
       }
     });
 
-    console.log(jQuery.type(idx));
-
     $(document).ready(function () {
       $('input#search').on('keyup', function () {
         var resultdiv = $('#results');
@@ -88,7 +86,7 @@
             })
           });
         resultdiv.empty();
-        resultdiv.prepend('<p id="results-count" class="results-found">' + result.length + ' {{ site.data.theme.t.menu.results_found | default: "Result(s) found" }}</p>');
+        resultdiv.prepend('<p id="results-count" class="results-found">' + result.length + ' {{ site.data.theme.t.results_found | default: "Result(s) found" }}</p>');
         for (var item in result) {
           var ref = result[item].ref;
           var searchitem =

_layouts/default.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <!--
-    Basically Basic Jekyll Theme 1.4.1
+    Basically Basic Jekyll Theme 1.4.4
     Copyright 2017-2018 Michael Rose - mademistakes.com | @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
 -->
 <html lang="{{ page.lang | default: site.lang | default: 'en-US' }}" class="no-js">
   {% include head.html %}

_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

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');

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

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

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