diff --git a/CHECKLIST.md b/CHECKLIST.md index d12395ddcbe..e922a0de810 100644 --- a/CHECKLIST.md +++ b/CHECKLIST.md @@ -4,4 +4,4 @@ - _config.yml unchanged -- _sass/settings/_colors.scss use default color theme \ No newline at end of file +- _sass/settings/_colors.scss use default skin \ No newline at end of file diff --git a/README-zh.md b/README-zh.md index 3daf4c17c16..1482bbe3161 100644 --- a/README-zh.md +++ b/README-zh.md @@ -25,24 +25,24 @@ TeXt 是针对个人网站、博客、项目、文档等等的一款 Jekyll 主 - Google Analytics - 联系方式设置(Email, Facebook, Twitter, 微博, 知乎……) - Web 语意化 -- Color Theme +- 皮肤 - 数学公式([MathJax](https://www.mathjax.org/)) - 流程图, 序列图,甘特图([mermaid](https://mermaidjs.github.io/)) - 柱状图,折线图,饼图,雷达图([chartjs](http://www.chartjs.org/)) - RSS([jekyll-feed](https://github.com/jekyll/jekyll-feed)) - 多语言支持(English, 简体中文, 繁體中文) -## Color Theme +## 皮肤 -TeXt 内置以下 6 套颜色主题: +TeXt 内置以下 6 套皮肤: | `default` | `dark` | `forest` | | --- | --- | --- | -| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_forest.png) | +| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_forest.png) | | `ocean` | `chocolate` | `orange` | | --- | --- | --- | -| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_orange.png) | +| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_orange.png) | ## 文档 diff --git a/README.md b/README.md index f15dbab7bc9..84ee9354a37 100644 --- a/README.md +++ b/README.md @@ -25,24 +25,24 @@ TeXt is a Jekyll theme for personal site, blog, project, documentation and so on - Google Analytics - Contact information (Email, Facebook, Twitter, Linkedin, Weibo, Zhihu, etc) - Semantic HTML -- Color Theme +- Skins - Mathematical formula ([MathJax](https://www.mathjax.org/)) - Flowchart, Sequence diagram, Gantt diagram ([mermaid](https://mermaidjs.github.io/)) - Line Chart, Bar Chart, Radar Chart, Pie Chart ([chartjs](http://www.chartjs.org/)) - RSS([jekyll-feed](https://github.com/jekyll/jekyll-feed)) - Multi-language support(English, Simplified Chinese, Traditional Chinese) -## Color Themes +## Skins -You can choose these 6 built-in color themes below: +You can choose these 6 built-in skins below: | `default` | `dark` | `forest` | | --- | --- | --- | -| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_forest.png) | +| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_forest.png) | | `ocean` | `chocolate` | `orange` | | --- | --- | --- | -| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_orange.png) | +| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_orange.png) | ## Documentation diff --git a/_config.yml b/_config.yml index ad87de01bc9..5801a67fb7c 100644 --- a/_config.yml +++ b/_config.yml @@ -16,7 +16,7 @@ ## => Site Settings ############################## -text_color_theme: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" +text_skin: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" url : # the base hostname & protocol for your site e.g. https://www.someone.com baseurl : # does not include hostname title : Someone's blog diff --git a/_data/variables.yml b/_data/variables.yml index d431ff40ff6..2dccc242acd 100644 --- a/_data/variables.yml +++ b/_data/variables.yml @@ -1,5 +1,5 @@ default: - text_color_theme: default + text_skin: default lang: en paths: root: / @@ -16,6 +16,7 @@ default: excerpt_type: text page: + type: webpage show_header: true show_title: true show_edit_on_github: false diff --git a/_sass/colors/_chocolate.scss b/_sass/skins/_chocolate.scss similarity index 98% rename from _sass/colors/_chocolate.scss rename to _sass/skins/_chocolate.scss index 30aee57aa8a..016c26c3cda 100644 --- a/_sass/colors/_chocolate.scss +++ b/_sass/skins/_chocolate.scss @@ -1,5 +1,5 @@ /// -// Color Theme: Chocolate +// Skin: Chocolate // Author: Tian Qi // Email: kitian616@outlook.com /// diff --git a/_sass/colors/_dark.scss b/_sass/skins/_dark.scss similarity index 98% rename from _sass/colors/_dark.scss rename to _sass/skins/_dark.scss index 1c2bd108828..a8b797b7461 100644 --- a/_sass/colors/_dark.scss +++ b/_sass/skins/_dark.scss @@ -1,5 +1,5 @@ /// -// Color Theme: Dark +// Skin: Dark // Author: Tian Qi // Email: kitian616@outlook.com /// diff --git a/_sass/colors/_default.scss b/_sass/skins/_default.scss similarity index 98% rename from _sass/colors/_default.scss rename to _sass/skins/_default.scss index ae7cc4b63c2..8af6352084e 100644 --- a/_sass/colors/_default.scss +++ b/_sass/skins/_default.scss @@ -1,5 +1,5 @@ /// -// Color Theme: Default +// Skin: Default // Author: Tian Qi // Email: kitian616@outlook.com /// diff --git a/_sass/colors/_forest.scss b/_sass/skins/_forest.scss similarity index 98% rename from _sass/colors/_forest.scss rename to _sass/skins/_forest.scss index a490e76de9c..bed2589dd4e 100644 --- a/_sass/colors/_forest.scss +++ b/_sass/skins/_forest.scss @@ -1,5 +1,5 @@ /// -// Color Theme: Forest +// Skin: Forest // Author: Tian Qi // Email: kitian616@outlook.com /// diff --git a/_sass/colors/_ocean.scss b/_sass/skins/_ocean.scss similarity index 98% rename from _sass/colors/_ocean.scss rename to _sass/skins/_ocean.scss index 79393696372..8d90fdc3070 100644 --- a/_sass/colors/_ocean.scss +++ b/_sass/skins/_ocean.scss @@ -1,5 +1,5 @@ /// -// Color Theme: Ocean +// Skin: Ocean // Author: Tian Qi // Email: kitian616@outlook.com /// diff --git a/_sass/colors/_orange.scss b/_sass/skins/_orange.scss similarity index 98% rename from _sass/colors/_orange.scss rename to _sass/skins/_orange.scss index d3c88038dda..cbed4f99a77 100644 --- a/_sass/colors/_orange.scss +++ b/_sass/skins/_orange.scss @@ -1,5 +1,5 @@ /// -// Color Theme: Orange +// Skin: Orange // Author: Tian Qi // Email: kitian616@outlook.com /// diff --git a/about.md b/about.md index 5814d85189b..71d0e4ec901 100644 --- a/about.md +++ b/about.md @@ -31,21 +31,21 @@ TeXt is succinct Jekyll theme, Perfect for hosting your personal site, blog, doc - Contact information (Email, Facebook, Twitter, Linkedin, Weibo, Zhihu, etc) - Semantic HTML - Icon automation tool ([gulp-svg2png](https://www.npmjs.com/package/gulp-svg2png), [gulp-to-ico](https://www.npmjs.com/package/gulp-to-ico)) -- Color Theme +- Skins - Mathematical formula ([MathJax](https://www.mathjax.org/)) - Flowchart, Sequence diagram, Gantt diagram ([mermaid](https://mermaidjs.github.io/)) - Line Chart, Bar Chart, Radar Chart, Pie Chart ([chartjs](http://www.chartjs.org/)) - RSS([jekyll-feed](https://github.com/jekyll/jekyll-feed)) - Multi-language support(English, Simplified Chinese, Traditional Chinese) -## Color Themes +## Skins -You can choose these 6 built-in color themes below: +You can choose these 6 built-in Skins below: | `default` | `dark` | `forest` | | --- | --- | --- | -| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_forest.png) | +| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_forest.png) | | `ocean` | `chocolate` | `orange` | | --- | --- | --- | -| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_orange.png) | \ No newline at end of file +| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_orange.png) | \ No newline at end of file diff --git a/assets/css/main.scss b/assets/css/main.scss index 475852f9012..6012eca1893 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -4,13 +4,13 @@ @charset "utf-8"; @import - "colors/{{ site.text_color_theme | default: site.data.variables.default.text_color_theme }}", - // "colors/chocolate", - // "colors/dark", - // "colors/default", - // "colors/forest", - // "colors/ocean", - // "colors/orange", + "skins/{{ site.text_skin | default: site.data.variables.default.text_skin }}", + // "skins/chocolate", + // "skins/dark", + // "skins/default", + // "skins/forest", + // "skins/ocean", + // "skins/orange", "common/variables", "common/highlighting", diff --git a/docs/_config.dev.yml b/docs/_config.dev.yml index ebf5290f53b..b180722e6ae 100644 --- a/docs/_config.dev.yml +++ b/docs/_config.dev.yml @@ -16,7 +16,7 @@ ## => Site Settings ############################## -text_color_theme: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" +text_skin: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" url : # the base hostname & protocol for your site e.g. https://www.someone.com baseurl : # does not include hostname title : TeXt Dev diff --git a/docs/_config.yml b/docs/_config.yml index 3ebee3dce29..65f84695721 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -16,7 +16,7 @@ ## => Site Settings ############################## -text_color_theme: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" +text_skin: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" url : https://tianqi.name baseurl : /jekyll-TeXt-theme title : TeXt Theme diff --git a/docs/_data/variables.yml b/docs/_data/variables.yml index 479db24d95b..2dccc242acd 100644 --- a/docs/_data/variables.yml +++ b/docs/_data/variables.yml @@ -1,5 +1,5 @@ default: - text_color_theme: default + text_skin: default lang: en paths: root: / @@ -16,7 +16,7 @@ default: excerpt_type: text page: - type: 'webpage' + type: webpage show_header: true show_title: true show_edit_on_github: false diff --git a/docs/en/1.7-update-form-1-to-2.md b/docs/en/1.7-update-form-1-to-2.md index 3812da001b2..9237258889b 100644 --- a/docs/en/1.7-update-form-1-to-2.md +++ b/docs/en/1.7-update-form-1-to-2.md @@ -4,8 +4,24 @@ permalink: /docs/en/update-form-1-to-2 key: docs-update-form-1-to-2 --- +![TeXt 2](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/TeXt-version-2.png) + After several months effort, **TeXt 2** has finally released. the new version has lots of refactors and changes, witch leads to some configuration incompatibility. Hope this document will help you with your upgrade. +## Skin + +`text_color_theme` in *_config.yml* rename to `text_skin`. + +1.x: + +```yml +text_color_theme: forest +``` + +```yml +text_skin: forest +``` + ## Layout ### Article Layout @@ -72,7 +88,7 @@ layout: archive ## Paths -In order to maintain consistency with the layout naming, TeXt 2 renamed `all.html` to `archive.html`. `base` and `all` variables under `paths` in *_config.yml* has renamed to `root` and `archive`. +In order to maintain consistency with the layout naming, TeXt 2 renamed *all.html* to *archive.html*. `base` and `all` variables under `paths` in *_config.yml* has renamed to `root` and `archive`. 1.x: @@ -88,6 +104,7 @@ paths: ```yml paths: root : /blog + home : /blog archive : /blog/archive.html rss : /feed.xml ``` diff --git a/docs/en/2.1-configuration.md b/docs/en/2.1-configuration.md index 63f7443cf13..0f196e545d3 100644 --- a/docs/en/2.1-configuration.md +++ b/docs/en/2.1-configuration.md @@ -21,20 +21,20 @@ If you’re using the Ruby gem version of the theme you’ll need this line to a theme: jekyll-text-theme ``` -### Color Theme +### Skin -You can choose these 6 built-in color themes below: +You can choose these 6 built-in skins below: | `default` | `dark` | `forest` | | --- | --- | --- | -| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_forest.png) | +| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_forest.png) | | `ocean` | `chocolate` | `orange` | | --- | --- | --- | -| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_orange.png) | +| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_orange.png) | ```yaml -text_color_theme: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" +text_skin: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" ``` ### URL diff --git a/docs/zh/1.7-update-form-1-to-2.md b/docs/zh/1.7-update-form-1-to-2.md index b6ab38c619d..f66dc94cb3f 100644 --- a/docs/zh/1.7-update-form-1-to-2.md +++ b/docs/zh/1.7-update-form-1-to-2.md @@ -4,8 +4,24 @@ permalink: /docs/zh/update-form-1-to-2 key: docs-update-form-1-to-2-zh --- +![TeXt 2](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/TeXt-version-2.png) + 经过几个月的努力,**TeXt 2** 终于发布了,第二版在第一版的基础上做了大量的重构与更改,这也导致了一些配置的不兼容。希望这篇文档能对你的升级起到一些帮助,感谢你们的支持。 +## 皮肤 + +*_config.yml* 中 `text_color_theme` 配置项更名为 `text_skin`。 + +1.x: + +```yml +text_color_theme: forest +``` + +```yml +text_skin: forest +``` + ## Layout ### Article 布局 @@ -38,7 +54,7 @@ show_edit_on_github: true pageview: true ``` -你也可以在 _config.yml 中设置 posts 类型的[默认值](https://jekyllrb.com/docs/configuration/#front-matter-defaults): +你也可以在 *_config.yml* 中设置 posts 类型的[默认值](https://jekyllrb.com/docs/configuration/#front-matter-defaults): ```yml defaults: @@ -70,20 +86,9 @@ layout: all layout: archive ``` -为了保持和布局命名的一致性,新版将原有的 `all.html` 更名为 `archive.html`,这在一些默认配置中也做了相应的修改: - -```yml -paths: - base: /blog - archive: /blog/archive.html - rss: /feed.xml -``` - -请留意关于”all“的报错,并将其修改为“archive”。 - ## Paths -为了保持和布局命名的一致性,新版将原有的 `all.html` 更名为 `archive.html`。*_config.yml* 中 `paths` 的配置项 `base` 和 `all` 分别更名为 `root` 和 `archive`。 +为了保持和布局命名的一致性,新版将原有的 *all.html* 更名为 *archive.html*。*_config.yml* 中 `paths` 的配置项 `base` 和 `all` 分别更名为 `root` 和 `archive`。 1.x: @@ -99,6 +104,7 @@ paths: ```yml paths: root : /blog + home : /blog archive : /blog/archive.html rss : /feed.xml ``` diff --git a/docs/zh/2.1-configuration.md b/docs/zh/2.1-configuration.md index 64b0b26ea78..990fafa3a3b 100644 --- a/docs/zh/2.1-configuration.md +++ b/docs/zh/2.1-configuration.md @@ -21,20 +21,20 @@ Jekyll 允许你很轻松的设计你的网站,这很大程度上归功于灵 theme: jekyll-text-theme ``` -### 颜色主题 +### 皮肤 -TeXt 内置了以下 6 中颜色主题: +TeXt 内置以下 6 套皮肤: | `default` | `dark` | `forest` | | --- | --- | --- | -| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_forest.png) | +| ![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_default.png) | ![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_dark.png) | ![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_forest.png) | | `ocean` | `chocolate` | `orange` | | --- | --- | --- | -| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_orange.png) | +| ![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_ocean.png) | ![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_chocolate.png) | ![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_orange.png) | ```yaml -text_color_theme: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" +text_skin: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" ``` ### URL diff --git a/screenshots/TeXt-version-2.png b/screenshots/TeXt-version-2.png new file mode 100644 index 00000000000..894efc7346d Binary files /dev/null and b/screenshots/TeXt-version-2.png differ diff --git a/screenshots/TeXt.sketch b/screenshots/TeXt.sketch index 00d77d84c13..4dbb55a9435 100644 Binary files a/screenshots/TeXt.sketch and b/screenshots/TeXt.sketch differ diff --git a/screenshots/colors_chocolate.png b/screenshots/skins_chocolate.png similarity index 100% rename from screenshots/colors_chocolate.png rename to screenshots/skins_chocolate.png diff --git a/screenshots/colors_dark.png b/screenshots/skins_dark.png similarity index 100% rename from screenshots/colors_dark.png rename to screenshots/skins_dark.png diff --git a/screenshots/colors_default.png b/screenshots/skins_default.png similarity index 100% rename from screenshots/colors_default.png rename to screenshots/skins_default.png diff --git a/screenshots/colors_forest.png b/screenshots/skins_forest.png similarity index 100% rename from screenshots/colors_forest.png rename to screenshots/skins_forest.png diff --git a/screenshots/colors_ocean.png b/screenshots/skins_ocean.png similarity index 100% rename from screenshots/colors_ocean.png rename to screenshots/skins_ocean.png diff --git a/screenshots/colors_orange.png b/screenshots/skins_orange.png similarity index 100% rename from screenshots/colors_orange.png rename to screenshots/skins_orange.png diff --git a/test/_config.yml b/test/_config.yml index 6b3bdcdeb97..cfc08848bb0 100644 --- a/test/_config.yml +++ b/test/_config.yml @@ -16,7 +16,7 @@ theme: jekyll-text-theme ## => Site Settings ############################## -text_color_theme: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" +text_skin: default # "default" (default), "dark", "forest", "ocean", "chocolate", "orange" url : # the base hostname & protocol for your site e.g. https://www.someone.com baseurl : # does not include hostname title : Someone's blog diff --git a/test/_data/variables.yml b/test/_data/variables.yml index b6b2ae58891..2dccc242acd 100644 --- a/test/_data/variables.yml +++ b/test/_data/variables.yml @@ -1,8 +1,9 @@ default: - text_color_theme: default + text_skin: default lang: en paths: root: / + home: / archive: /archive.html rss: /feed.xml mathjax: false @@ -15,6 +16,7 @@ default: excerpt_type: text page: + type: webpage show_header: true show_title: true show_edit_on_github: false diff --git a/test/_posts/2015-01-03-article-with-lots-images.md b/test/_posts/2015-01-03-article-with-lots-images.md index de92692ebe7..f4aa97df00d 100644 --- a/test/_posts/2015-01-03-article-with-lots-images.md +++ b/test/_posts/2015-01-03-article-with-lots-images.md @@ -14,26 +14,26 @@ tags: Test English ![TeXt Theme Details](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/TeXt-details.png) -## Color Theme: Default +## Skin: Default -![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_default.png) +![default](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_default.png) -## Color Theme: Dark +## Skin: Dark -![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_dark.png) +![dark](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_dark.png) -## Color Theme: Forest +## Skin: Forest -![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_forest.png) +![forest](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_forest.png) -## Color Theme: Ocean +## Skin: Ocean -![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_ocean.png) +![ocean](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_ocean.png) -## Color Theme: Chocolate +## Skin: Chocolate -![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_chocolate.png) +![chocolate](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_chocolate.png) -## Color Theme: Orange +## Skin: Orange -![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/colors_orange.png) \ No newline at end of file +![orange](https://raw.githubusercontent.com/kitian616/jekyll-TeXt-theme/master/screenshots/skins_orange.png) \ No newline at end of file diff --git a/tools/resize-colors-imgs.sh b/tools/resize-colors-imgs.sh index 61e9071a6d1..a1911326d44 100644 --- a/tools/resize-colors-imgs.sh +++ b/tools/resize-colors-imgs.sh @@ -1 +1 @@ -mogrify -resize 800 -path screenshots screenshots/origin/colors_*.png \ No newline at end of file +mogrify -resize 800 -path screenshots screenshots/origin/skins_*.png \ No newline at end of file