diff --git a/Gemfile b/Gemfile index dd1e7e4af..fcbf5bc3e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gemspec # # source "https://rubygems.org" -# gem 'jekyll', '= 3.4.5' # locked in to be consistent GitHub Pages. +# gem 'jekyll', '= 3.5.2' # locked in to be consistent GitHub Pages. # group :jekyll_plugins do # gem 'jekyll-feed' diff --git a/README.md b/README.md index 15720b187..a7c68a993 100644 --- a/README.md +++ b/README.md @@ -34,26 +34,30 @@ please follow the commands below first: cd jekyllapp -Then for newly created or existing Jekyll app, +4. Then follow the instructions below like existing Jekyll app. + +Then for existing Jekyll apps, 1. Install Bundler if haven't done so. gem install bundler -2. Remove Jekyll auto-generated default pages `about.md` and `index.md`. +1. Remove Jekyll auto-generated default pages `404.html`, `about.md` and `index.md` or any your custom layouts or existing theme files. + +1. Remove the existing `Gemfile.lock`. -3. Download the respository [here](https://github.com/yizeng/jekyll-theme-simple-texture/archive/master.zip) +1. Download the respository [here](https://github.com/yizeng/jekyll-theme-simple-texture/archive/master.zip) and locate `starter-kit` folder, or download `starter-kit` folder directly [here](https://minhaskamal.github.io/DownGit/#/home?url=https://github.com/yizeng/jekyll-theme-simple-texture/tree/master/starter-kit). -4. Put everything in the `starter-kit` in the root directory, +1. Put everything in the `starter-kit` in the root directory, i.e. `jekyllapp` in this example. -5. Run `bundle install` to install dependencies. +1. Run `bundle install` to install dependencies. -6. Run Jekyll with `bundle exec jekyll serve` +1. Run Jekyll with `bundle exec jekyll serve` -7. Hack away at ! +1. Hack away at ! ### As a fork @@ -74,7 +78,7 @@ i.e. `jekyllapp` in this example. ```ruby source "https://rubygems.org" - gem 'jekyll', '= 3.4.5' # locked in to be consistent GitHub Pages. + gem 'jekyll', '= 3.5.2' # locked in to be consistent GitHub Pages. group :jekyll_plugins do gem 'jekyll-feed' diff --git a/_config.yml b/_config.yml index be5094da7..658c6b816 100644 --- a/_config.yml +++ b/_config.yml @@ -5,7 +5,7 @@ lang: en # Language code as defined in _data/i18n.yml. en, en-gb, en-us, zh, zh- permalink: /blog/:year/:month/:day/:title/ whitelist: [jekyll-feed, jekyll-redirect-from, jekyll-seo-tag, jekyll-sitemap] -gems: +plugins: - jekyll-feed - jekyll-redirect-from - jekyll-seo-tag @@ -51,9 +51,9 @@ home: section2:

A gem-based responsive simple texture styled Jekyll theme

section3: blog: - cc_license: # A link to CC License of your choice, e.g. http://creativecommons.org/licenses/by-sa/4.0/. - cc_license_image: # An image of your CC License, e.g. /assets/images/theme/cc-by-sa.png - footer_content: A gem-based responsive simple texture styled Jekyll theme. + cc_license: http://creativecommons.org/licenses/by-sa/4.0/ # A link to CC License of your choice. + cc_license_image: /assets/images/theme/cc-by-sa.png # An image of your CC License. + footer_content: A gem-based responsive simple texture styled Jekyll theme. disqus: shortname: diff --git a/_data/i18n.yml b/_data/i18n.yml index 7996211e7..f864ca920 100644 --- a/_data/i18n.yml +++ b/_data/i18n.yml @@ -4,7 +4,6 @@ en: &en back_to_top: 'Back to Top' categories: 'Categories' close: 'Close' - copyright: '

Theme Simple Texture developed by Yi Zeng, powered by Jekyll.

' enter_blog: 'Enter Blog' last_updated: 'Last updated' menu: 'Menu' @@ -26,6 +25,7 @@ en: &en show_comments: 'Show Comments' show_license: 'Show License' tags: 'Tags' + theme_info: '

Theme Simple Texture developed by Yi Zeng, powered by Jekyll.

' view: 'View' en-us: <<: *en @@ -43,7 +43,6 @@ zh: &zh back_to_top: '返回顶部' categories: '文章分类' close: '关闭' - copyright: '

本博客主题 Simple Texture 由 Yi Zeng 基于 Jekyll 开发.

' enter_blog: '进入博客' last_updated: '最后更新于' menu: '菜单' @@ -66,6 +65,7 @@ zh: &zh show_comments: '显示评论' show_license: '显示许可证' tags: '文章标签' + theme_info: '

本博客主题 Simple Texture 由 Yi Zeng 基于 Jekyll 开发.

' view: '查阅' zh-cn: <<: *zh diff --git a/_includes/blog/footer.html b/_includes/blog/footer.html index 8159e5254..df59cb399 100644 --- a/_includes/blog/footer.html +++ b/_includes/blog/footer.html @@ -7,7 +7,7 @@

{{ site.data.i18n[site.lang]. {% if site.blog.footer_content %}

{{ site.blog.footer_content }}

{% endif %} - {{ site.data.i18n[site.lang].copyright }} + {{ site.data.i18n[site.lang].theme_info }}