From ca3921d9bc39fc9987c4fd2eae85287cec72ac46 Mon Sep 17 00:00:00 2001 From: nodejh Date: Mon, 4 Dec 2017 22:28:52 +0800 Subject: [PATCH] Rewrite tags page, remove duoshuo comment, upate summary --- README.md | 96 +++++----------- README_zh-cn.md | 103 ++++++------------ exampleSite/config.toml | 81 ++++++++------ .../content/post/creating-a-new-theme.md | 9 +- exampleSite/content/post/goisforlovers.md | 8 +- exampleSite/content/post/hugoisforlovers.md | 2 + .../content/post/migrate-from-jekyll.md | 7 +- exampleSite/content/tags/_index.md | 15 --- layouts/_default/single.html | 18 ++- layouts/_default/terms.html | 28 +++++ layouts/partials/duoshuo.html | 18 --- layouts/partials/github-issues-tip.html | 5 - layouts/partials/post-list.html | 11 +- layouts/partials/share.html | 4 +- layouts/partials/tagcloud.html | 11 -- layouts/taxonomy/tag.terms.html | 21 ---- static/css/style.css | 31 +++--- 17 files changed, 189 insertions(+), 279 deletions(-) delete mode 100644 exampleSite/content/tags/_index.md create mode 100644 layouts/_default/terms.html delete mode 100644 layouts/partials/duoshuo.html delete mode 100644 layouts/partials/github-issues-tip.html delete mode 100644 layouts/partials/tagcloud.html delete mode 100644 layouts/taxonomy/tag.terms.html diff --git a/README.md b/README.md index 01fbced..fc3b822 100644 --- a/README.md +++ b/README.md @@ -1,43 +1,37 @@ -# Cactus Plus +# Hogu Theme Cactus Plus -[English Document](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/README.md) | [中文文档](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/README_zh-cn.md) +Cactus Plus is a minimalistic theme for bloggers based on the theme named [Cactus](https://github.com/digitalcraftsman/hugo-cactus-theme). + +**Features** + ++ **More beautiful style** ++ **Tags page** ++ **Archive page** ++ **[Disqus](https://disqus.com/) comment-system** ++ **Both Google Analytics and Baidu Analytics for site analytics.** ++ **Table of Content** + +Here's the link to online demo: [http://nodejh.com](http://nodejh.com). +[English Document](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/README.md) | [中文文档](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/README_zh-cn.md) -- [Cactus Plus](#cactus-plus) +- [Hogu Theme Cactus Plus](#hogu-theme-cactus-plus) - [Screenshot](#screenshot) - [Installation](#installation) - [Example Site](#example-site) - - [The config file](#the-config-file) + - [Posts Summary](#posts-summary) - [About page](#about-page) - - [Tags page](#tags-page) - [Avatar](#avatar) - [Hide pages](#hide-pages) - [Disqus](#disqus) - - [Duoshuo](#duoshuo) - - [Disable Comment](#disable-comment) - - [Google Analytics](#google-analytics) - - [Baidu Tongji](#baidu-tongji) - [Social link icons](#social-link-icons) - [Nearly finished](#nearly-finished) - [License](#license) - - [Acknowledgements](#acknowledgements) -Cactus Plus is a minimalistic theme for bloggers based on the theme named [Cactus](https://github.com/digitalcraftsman/hugo-cactus-theme). - -**Noteworthy updates of this Hugo theme are :** - -+ **a tags page** -+ **an archive page** -+ **both [Disqus](https://disqus.com/) and [Duoshuo](http://duoshuo.com/) comment-system** -+ **both Google Analytics and Baidu Tongji for site analytics.** -+ **Table of Content** - -Here's the link to online demo: [http://nodejh.com](http://nodejh.com). - ## Screenshot **home page** @@ -47,49 +41,39 @@ Here's the link to online demo: [http://nodejh.com](http://nodejh.com). **tags page** ![Screenshot](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/images/tags.png) - **archive page** ![Screenshot](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/images/archive.png) ## Installation +First clone the theme to your themes directory: + ``` $ cd themes $ git clone https://github.com/nodejh/hugo-theme-cactus-plus.git ``` -For more information read the official [setup guide](//gohugo.io/overview/installing/) of Hugo. +Take a look inside the [`exampleSite`](https://github.com/nodejh/hugo-theme-cactus-plus/tree/master/exampleSite) folder of this theme. You'll find a file called [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml). +To use it, copy the [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml) in the root folder of your Hugo site. Feel free to change strings as you like to customize your website. + +For more information read the official [setup guide](//gohugo.io/overview/installing/) of Hugo. ## Example Site -There is an example site with config file and markdown files in [`exampleSite`](https://github.com/nodejh/hugo-theme-cactus-plus/tree/master/exampleSite) directory. +## Posts Summary -## The config file +Summary will show follow the post title title in home page. -Take a look inside the [`exampleSite`](https://github.com/nodejh/hugo-theme-cactus-plus/tree/master/exampleSite) folder of this theme. You'll find a file called [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml). +And if you want to use description property that in post's fromt matter to instated of post's content summary, set `useDescriptionReplaceSummary = true`. -To use it, copy the [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml) in the root folder of your Hugo site. Feel free to change strings as you like to customize your website. +To use the content summary, you may add the `` summary divider where you want to split the article alternatively. For org content, use # more where you want to split the article. Content that comes before the summary divider will be used as that content’s summary.By default, Hugo automatically takes the first 70 words of your content as its summary. See also [https://gohugo.io/content-management/summaries/](https://gohugo.io/content-management/summaries/). ## About page Use the about page to introduce yourself to your visitors. You can customize the content as you like in the `/content/about/_index.md`. -## Tags page - -Use the tags page to show all post's tags. You can create the file `/content/tags/_index.md` and set `hidden = true` so that the page does not show on your home page or other lists of pages. - -For example: - -```markdown -+++ -date = "2015-06-20T14:02:37+02:00" -title = "Tags" -hidden = true -+++ -``` - ## Avatar Furthermore, you should replace the [avatar placeholder](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/static/images/) with a great image of yourself. @@ -103,26 +87,6 @@ Pages can be hidden and don't appear in the post list on the homepage if you add This theme features a comment system powered by Disqus. Just add your Disqus-shortname to the [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml) and set `enableDisqus = true`, then let readers respond to your blog posts. -## Duoshuo - -This theme features a comment system powered by Duoshuo too. Duoshuo is mainly provide for Chinese users. Just add your Duoshuo-shortname to the [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml) and set `enableDuoshuo = true`. - - -## Disable Comment - -Just set both `enableDisqus = false` and `enableDuoshuo = false` if you want to disable comment. - - - -## Google Analytics - -This theme use Google Analytics by default. If you want to disable Google Analytics, just set `enableGoogleAnalytics = false` in [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml). - -## Baidu Tongji - -This theme alse features Baidu Tongji for Chinese users. To use Baidu Tongji you should set `enableBaiduAnalytics = true` and set `baiduAnalytics` to your `Baidu Tongji Code` which looks like `39843ea392201290bd6f76173d2e0000` in [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml). - - ## Social link icons You can add a social link panel in the footer by adding entries to the `social` block in the [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml). You can choose between two icon fonts: @@ -144,14 +108,6 @@ $ hugo server Now enter [`localhost:1313`](http://localhost:1313) in the address bar of your browser. - ## License This theme is released under the MIT license. For more information read the [license](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/LICENSE.md). - - -## Acknowledgements - -Thanks to - -- [hugo-cactus-theme](https://github.com/digitalcraftsman/hugo-cactus-theme) diff --git a/README_zh-cn.md b/README_zh-cn.md index ef24f0d..eb79a17 100644 --- a/README_zh-cn.md +++ b/README_zh-cn.md @@ -1,44 +1,38 @@ +# Hugo Theme Cactus Plus + +Cactus Plus 是在 [Cactus](https://github.com/digitalcraftsman/hugo-cactus-theme) 更改的一个简约主题。 + +**特点** + ++ **更漂亮的样式** ++ **添加了标签页** ++ **添加了归档页** ++ **集成了 [Disqus](https://disqus.com/) 评论系统** ++ **提供了 Google Analytics 和百度统计** ++ **文章目录** + +示例网站： [http://nodejh.com](http://nodejh.com)。 + +[English Document](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/README.md) | [中文文档](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/README_zh-cn.md) + + -- [Cactus Plus](#cactus-plus) +- [Hugo Theme Cactus Plus](#hugo-theme-cactus-plus) - [截图](#截图) - [安装](#安装) - [示例站点](#示例站点) - - [配置文件](#配置文件) + - [文章摘要](#文章摘要) - [关于页面](#关于页面) - - [标签页](#标签页) - [头像](#头像) - [隐藏页面](#隐藏页面) - [Disqus 评论](#disqus-评论) - - [多说评论](#多说评论) - - [不使用评论系统](#不使用评论系统) - - [Google Analytics](#google-analytics) - - [百度统计](#百度统计) - [社交链接](#社交链接) - [部署主题](#部署主题) - [License](#license) - - [鸣谢](#鸣谢) -# Cactus Plus - - -[English Document](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/README.md) | [中文文档](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/README_zh-cn.md) - -Cactus Plus 是一个根据 [Cactus](https://github.com/digitalcraftsman/hugo-cactus-theme) 改编的简约主题。 - -**Cactus Plus 的主要更新如下：** - -+ **添加了标签页** -+ **添加了归档页** -+ **集成了 [Disqus](https://disqus.com/) 和[多说](http://duoshuo.com/)评论系统** -+ **提供了 Google Analytics 和百度统计** -+ **文章目录** - -示例网站： [http://nodejh.com](http://nodejh.com)。 - - ## 截图 **首页** @@ -55,25 +49,33 @@ Cactus Plus 是一个根据 [Cactus](https://github.com/digitalcraftsman/hugo-ca ## 安装 -进入 `hugo` 的站点目录运行下面的命令： +首先进入 `hugo` 的站点目录运行下面的命令： ``` $ cd themes $ git clone https://github.com/nodejh/hugo-theme-cactus-plus.git ``` +本主题提供了一个示例配置文件是 [`exampleSite`](https://github.com/nodejh/hugo-theme-cactus-plus/tree/master/exampleSite) 目录里的 [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml) 文件。 + +配置文件中对大部分配置都有详细的注释说明，复制该文件到站点目录下，根据自己的情况修改即可。 + +更多安装信息查看 Hugo 官方文档 [setup guide](//gohugo.io/overview/installing/)。 ## 示例站点 [`exampleSite`](https://github.com/nodejh/hugo-theme-cactus-plus/tree/master/exampleSite) 是本主题的一个示例站点，里面有配置文件、关于页面的一些示例。 -## 配置文件 +## 文章摘要 -本主题提供了一个示例配置文件是 [`exampleSite`](https://github.com/nodejh/hugo-theme-cactus-plus/tree/master/exampleSite) 目录里的 [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml) 文件。 +Summary will show follow the post title title in home page. -配置文件中对大部分配置都有详细的注释说明，复制该文件到站点目录下，根据自己的情况修改即可。 +摘要会显示在首页的文章标题下面。 + +如果你想用文章头信息中的 `description` 属性代替文章内容摘要，将 `useDescriptionReplaceSummary` 设置为 `true` 即可。 +如果要使用文章内容摘要，你可能需要在文章中添加 `` 分割线来分割文章。分割线前面的字符会作为文章摘要。默认情况下，Hugo 会截取内容的前 70 个字作为摘要。查看更多 [https://gohugo.io/content-management/summaries/](https://gohugo.io/content-management/summaries/). ## 关于页面 @@ -81,20 +83,6 @@ $ git clone https://github.com/nodejh/hugo-theme-cactus-plus.git 你也可以参考本主题示例站点中的关于页：[`exampleSite/content/about/index.md`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/content/about/index.md)。 -## 标签页 - -本主题也提供了 `标签页` 功能。 - -在 `content` 目录下新建一个名为 `tags` 的目录，然后在次目录创建一个名为 `_index.md` 的文件，写入下面的内容，注意设置 `hidden = true` 即可： - -```markdown -+++ -date = "2015-06-20T14:02:37+02:00" -title = "Tags" -hidden = true -+++ -``` - ## 头像 你需要将 [images](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/static/images/) 目录下的 `avatar.png`、`avatar@2x.png` 和 `favicon.ico` 都替换为你自己的图像。 @@ -118,27 +106,6 @@ hidden = true 将 `enableDisqus` 设置为 `false` 则不启用 Disqus 评论。 -## 多说评论 - -由于在中国大陆无法使用 Disqus，所以本主题提供了多说评论系统。多说评论系统的配置和 Disqus 配置基本一致。 - - -## 不使用评论系统 - -由于使用第三发评论系统会使网站加载速度变慢，所以也可以不使用评论系统。只需要将 `enableDisqus` 和 `enableDuoshuo` 都设置为 `false` 即可。 - -然后我的博客由于同步到了 Github Issues，所以也同时在主题中提供了跳转到 Github Issues 评论的文字提示。只需要设置 `enableGithubIssuesTips = true` 即可。当然，一般是不需要这么做的，这可能只是我个人需求。具体效果可以参考我的博客 [http://nodejh.com](http://nodejh.com)。 - - -## Google Analytics - -该主题默认使用了 Google Analytics。如果要禁用 Google Analytics，只需要设置 [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml) 中的 `enableGoogleAnalytics = false`。 - -## 百度统计 - -该主题同样也提供了百度统计，主要是方便中国大陆用户使用。开启百度统计的方式，首先需要设置 [`config.toml`](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/exampleSite/config.toml) 中的 `enableBaiduAnalytics = true`，然后将 `baiduAnalytics` 改为在百度统计后台获取的 `统计代码`，形如 `39843ea392201290bd6f76173d2e0000`。 - - ## 社交链接 本主题的社交链接是字体图标的样式，并放置在了页面底部。你可以通过在 `config.toml` 的 `social` 模块中修改添加你的社交链接。社交链接提供了两种字体图标，选用其中一种即可： @@ -165,9 +132,3 @@ $ hugo server ## License [MIT](https://github.com/nodejh/hugo-theme-cactus-plus/blob/master/LICENSE.md) - -## 鸣谢 - -特别感谢 [digitalcraftsman](https://github.com/digitalcraftsman) 的 [Cacuts](https://github.com/digitalcraftsman/hugo-cactus-theme) 主题： - -- [hugo-cactus-theme](https://github.com/digitalcraftsman/hugo-cactus-theme) diff --git a/exampleSite/config.toml b/exampleSite/config.toml index e2d4d69..315bb4b 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -1,40 +1,39 @@ # Site settings baseurl = "http://nodejh.com/" -# HTML Language Code Reference, such as en, zh-cn -languageCode = "en" -title = "Blog Title" +languageCode = "zh-cn" +title = "nodejh" theme = "hugo-theme-cactus-plus" # Enter your tracking code to enable Google Analytics -googleAnalytics = "your_google_analytics_code" +googleAnalytics = "UA-84989670-1" hasCJKLanguage = true [params] - name = "Hugo" - description = "Blog Description" - bio = "Blog biology" - # Enter optionally your twitter account - twitter = "your_twitter" - enableRSS = false + name = "nodejh" + description = "My Blog" + bio = "Web Developer" - # Disqus comment - disqusShortname = "your_disqus_short_name" - # Disable disqus comments by set `enableDisqus = "false"` - enableDisqus = false + enableRSS = true + + # Table of content + enableToc = true - # Duoshuo comment - duoshuoShortname = "your_duoshuo_short_name" - # Disable duoshuo comments by set `enableDuoshuo = "false"` - enableDuoshuo = false + # Disqus comment + disqusShortname = "nodejh" + # Enable disqus comment, true|false + enableDisqus = true - enableGithubIssuesTips = false + # Enable summary, true|false + enableSummary = true + # Use description replace summary, defalt false + useDescriptionReplaceSummary = false - # Enable googleAnalytics - enableGoogleAnalytics = false + # Enable Google Analytics + enableGoogleAnalytics = true - # Enable baiduAnalytics - enableBaiduAnalytics = false - # Baidu Tongji Code - baiduAnalytics = 'your_baidu_tongji_code' + # Enable Baidu Analytics + enableBaiduAnalytics = true + # Baidu Analytics Code + baiduAnalytics = '39843ea392201290bd6f76173d2e1633' # Add custom assets with their paths relative to the static folder customCSS = [] @@ -44,20 +43,37 @@ hasCJKLanguage = true # translate or customize each string of the theme. # Navigation links + # Home text, default: 'Home' home = "" + # About text, default: 'About' about = "" + # Archive text, default: 'Archive' archive = "" + # Subscribe button Text, default: 'Subscribe' subscribe = "" - tags = "" + # Pagination links + # default: 'Older Posts' olderPosts = "" + # default: 'Newer Posts' newerPosts = "" + + # show latest posts in single page + showLatestPosts = true + # Latest posts title, default: 'Read More' readMore = "" + + # default similar to: © Copyright 2017 ❤️ nodejh + # nodejh is site name specified in params.name copyright = "" - # Sharing options and author information in posts - aboutAuthor = "I am so interesting." + + # Share + enableShare = false + # Enter optionally your twitter account + twitterAccount = "" tweet = "" - share = "" + facebook = "" + # 404 page title404 = "" subtitle404 = "" @@ -67,9 +83,8 @@ hasCJKLanguage = true # The social icons can be styled differently if you use mono as font - circle, rounded, or empty socialIconStyle = "" - # Add additional social link entries underneath [social] - facebook-square = "your_facebook_link" - twitter-square = "your_twitter_link" - github-square = "your_github_link" + facebook-square = "https://www.facebook.com/nodejh" + twitter-square = "https://www.twitter.com/nodejh" + github-square = "https://www.github.com/nodejh" diff --git a/exampleSite/content/post/creating-a-new-theme.md b/exampleSite/content/post/creating-a-new-theme.md index c2683da..e96ddcd 100644 --- a/exampleSite/content/post/creating-a-new-theme.md +++ b/exampleSite/content/post/creating-a-new-theme.md @@ -8,14 +8,19 @@ menu: next: /tutorials/github-pages-blog prev: /tutorials/automated-deployments title: Creating a New Theme -description: This tutorial will show you how to create a simple theme in Hugo. +description: This tutorial will show you how to create a simple theme in Hugo. weight: 10 --- ### **Introduction** -This tutorial will show you how to create a simple theme in Hugo. I assume that you are familiar with HTML, the bash command line, and that you are comfortable using Markdown to format content. I'll explain how Hugo uses templates and how you can organize your templates to create a theme. I won't cover using CSS to style your theme. +This tutorial will show you how to create a simple theme in Hugo. + + + +I assume that you are familiar with HTML, the bash command line, and that you are comfortable using Markdown to format content. I'll explain how Hugo uses templates and how you can organize your templates to create a theme. I won't cover using CSS to style your theme. + We'll start with creating a new site with a very basic template. Then we'll add in a few pages and posts. With small variations on that, you will be able to create many different types of web sites. diff --git a/exampleSite/content/post/goisforlovers.md b/exampleSite/content/post/goisforlovers.md index fef9702..31ccb44 100644 --- a/exampleSite/content/post/goisforlovers.md +++ b/exampleSite/content/post/goisforlovers.md @@ -18,11 +18,17 @@ menu = "main" Hugo uses the excellent [go][] [html/template][gohtmltemplate] library for its template engine. It is an extremely lightweight engine that provides a very -small amount of logic. In our experience that it is just the right amount of +small amount of logic. + + + + +In our experience that it is just the right amount of logic to be able to create a good static website. If you have used other template systems from different languages or frameworks you will find a lot of similarities in go templates. + This document is a brief primer on using go templates. The [go docs][gohtmltemplate] provide more details. diff --git a/exampleSite/content/post/hugoisforlovers.md b/exampleSite/content/post/hugoisforlovers.md index 8902400..9b1bbd9 100644 --- a/exampleSite/content/post/hugoisforlovers.md +++ b/exampleSite/content/post/hugoisforlovers.md @@ -20,6 +20,8 @@ menu = "main" Goto [hugo releases](https://github.com/spf13/hugo/releases) and download the appropriate version for your os and architecture. + + Save it somewhere specific as we will be using it in the next step. More complete instructions are available at [installing hugo](/overview/installing/) diff --git a/exampleSite/content/post/migrate-from-jekyll.md b/exampleSite/content/post/migrate-from-jekyll.md index e6b6ce5..6d56029 100644 --- a/exampleSite/content/post/migrate-from-jekyll.md +++ b/exampleSite/content/post/migrate-from-jekyll.md @@ -11,9 +11,14 @@ weight: 10 --- ## Move static content to `static` -Jekyll has a rule that any directory not starting with `_` will be copied as-is to the `_site` output. Hugo keeps all static content under `static`. You should therefore move it all there. +Jekyll has a rule that any directory not starting with `_` will be copied as-is to the `_site` output. + + + +Hugo keeps all static content under `static`. You should therefore move it all there. With Jekyll, something that looked like + ▾ / ▾ images/ logo.png diff --git a/exampleSite/content/tags/_index.md b/exampleSite/content/tags/_index.md deleted file mode 100644 index 99065c7..0000000 --- a/exampleSite/content/tags/_index.md +++ /dev/null @@ -1,15 +0,0 @@ -+++ -date = "2015-06-20T14:02:37+02:00" -title = "Tags" -hidden = true -+++ - -Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ipsa ullam earum dolorum! Sed, perspiciatis. - -Lorem ipsum dolor sit amet, consectetur adipisicing elit. - -*** - -### Lorem ipsum dolor. - -Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ea dicta corporis ad inventore itaque impedit dolor atque amet exercitationem! Veniam qui voluptas maiores vel laudantium necessitatibus, velit ducimus! Iste hic facere, accusamus fugiat enim facilis. diff --git a/layouts/_default/single.html b/layouts/_default/single.html index e6ff7f6..ff10768 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,8 +2,8 @@ {{ partial "nav.html" . }} -
-
+
+

{{ .Title }} @@ -35,20 +35,16 @@

- {{ if .Site.Params.enableGithubIssuesTips }} - {{ partial "github-issues-tip.html" . }} + {{ if .Site.Params.enableShare }} + {{ partial "share.html" . }} {{ end }} {{ if .Site.Params.enableDisqus }} - {{ if ne .Params.disabledisqus "true" }} - {{ partial "disqus.html" . }} - {{ end }} + {{ partial "disqus.html" . }} {{ end }} - {{ if .Site.Params.enableDuoshuo }} - {{ if ne .Params.disableduoshuo "true" }} - {{ partial "duoshuo.html" . }} - {{ end }} + {{ if .Site.Params.showLatestPosts }} + {{ partial "latest-posts.html" . }} {{ end }} {{ partial "footer.html" . }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html new file mode 100644 index 0000000..fd84b2c --- /dev/null +++ b/layouts/_default/terms.html @@ -0,0 +1,28 @@ +{{ partial "head.html" . }} + + {{ partial "nav.html" . }} + {{ partial "profile.html" . }} + + +
+
+ +
+ {{ partial "footer.html" . }} +
+ + {{ partial "js.html" . }} + + diff --git a/layouts/partials/duoshuo.html b/layouts/partials/duoshuo.html deleted file mode 100644 index 3d77078..0000000 --- a/layouts/partials/duoshuo.html +++ /dev/null @@ -1,18 +0,0 @@ - -
- - - - diff --git a/layouts/partials/github-issues-tip.html b/layouts/partials/github-issues-tip.html deleted file mode 100644 index 6cc56b3..0000000 --- a/layouts/partials/github-issues-tip.html +++ /dev/null @@ -1,5 +0,0 @@ -
-
- 评论: 请点击 Gtihub Issues 链接跳转到评论页面 -
- diff --git a/layouts/partials/post-list.html b/layouts/partials/post-list.html index 967a926..630edf1 100644 --- a/layouts/partials/post-list.html +++ b/layouts/partials/post-list.html @@ -3,9 +3,16 @@ {{ $url := replace .Permalink .Site.BaseURL "" }} {{ if ne $url "about/" }}
  • - + - {{ .Title }}

    {{ .Description | markdownify }}

    + {{ .Title }} + {{ if .Site.Params.enableSummary }} + {{ if .Site.Params.useDescriptionReplaceSummary }} +

    {{ .Description | plainify }}

    + {{ else }} +

    {{ .Summary | plainify }}

    + {{ end }} + {{ end }}
    • {{ end }} diff --git a/layouts/partials/share.html b/layouts/partials/share.html index ef6c620..ae73b21 100644 --- a/layouts/partials/share.html +++ b/layouts/partials/share.html @@ -1,9 +1,9 @@ - + diff --git a/layouts/partials/tagcloud.html b/layouts/partials/tagcloud.html deleted file mode 100644 index efa9c23..0000000 --- a/layouts/partials/tagcloud.html +++ /dev/null @@ -1,11 +0,0 @@ - - diff --git a/layouts/taxonomy/tag.terms.html b/layouts/taxonomy/tag.terms.html deleted file mode 100644 index 8c04b53..0000000 --- a/layouts/taxonomy/tag.terms.html +++ /dev/null @@ -1,21 +0,0 @@ -{{ partial "head.html" . }} - - {{ partial "nav.html" . }} - {{ partial "profile.html" . }} - - -
    -
    - {{ range $name, $taxonomy := .Site.Taxonomies.tags }} - - {{ $name }}({{ len $taxonomy }}) - - {{ end }} -
    - {{ partial "footer.html" . }} -
    - - {{ partial "js.html" . }} - {{ partial "tagcloud.html" . }} - - diff --git a/static/css/style.css b/static/css/style.css index 47c8108..84ef7ff 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -222,7 +222,7 @@ nav.main-nav a.cta { #wrapper { max-width: 600px; margin: 0 auto; - padding: 60px 40px 100px 40px; + padding: 60px 20px 100px 20px; } #wrapper.home { @@ -364,7 +364,6 @@ em, i { #post-list h2 { font: normal 17px/1.5em "Helvetica Neue", Helvetica, Arial, sans-serif; color: #aaa; - max-width: 400px; margin-top: 2px; } @@ -544,7 +543,9 @@ Post List #header { } - +#wrapper.post { + max-width: 670px; +} .post { margin: auto; } @@ -833,9 +834,7 @@ h2.month { /* CUSTOM ADDITIONS */ #social { - display: flex; - flex-direction: row; - justify-content: center; + text-align: center; } a.symbol { @@ -906,24 +905,24 @@ a.symbol:hover { */ #wrapper.tags { - padding: 0px 40px 20px 40px; + max-width: 850px; + padding-top: 0; } .page-tags { text-align: center; } - -.page-tags .tags { - font: "Helvetica Neue", Helvetica, Arial, sans-serif; +.page-tags ul li { margin: 10px 15px; - text-transform: uppercase; - letter-spacing: 1px; display: inline-block; + font-size: 1.2em; } +.page-tags ul li a { + color: #8a8a8a; -.page-tags .tags a { - color: #666; } - -.page-tags .tags:hover a { +.page-tags ul li a span { + font-size: .9em; +} +.page-tags ul li a:hover { color: #5694f1; }