Merge pull request #43 from Zebradil/master

♻️ Migration from highlight.js to Chroma
xianmin · Apr 22, 2018 · e683155 · e683155
2 parents a7471d2 + c80a3ed
commit e683155
Show file tree

Hide file tree

Showing 13 changed files with 567 additions and 188 deletions.
diff --git a/dev-config.toml b/dev-config.toml
@@ -6,6 +6,20 @@ baseURL = "http://en.xianmin.org/hugo-theme-jane/"
 enableRobotsTXT = true
 enableEmoji = true
 
+hasCJKLanguage = true     # has chinese/japanese/korean ? # 自动检测是否包含 中文\日文\韩文
+paginate = 5                                              # 首页每页显示的文章数
+rssLimit = 20             # Limit Entry Count to Rss file # 限制 Rss 文章输出数量
+disqusShortname = "xianmin12"      # disqus_shortname
+googleAnalytics = "UA-34199129-1"      # UA-XXXXXXXX-X
+copyright = ""            # default: author.name ↓        # 默认为下面配置的author.name ↓
+# uglyURLs = true
+
+# Highlight options. See https://gohugo.io/content-management/syntax-highlighting/
+pygmentsCodeFences = true # Enable syntax highlighting with GitHub flavoured code fences
+pygmentsUseClasses = true # Use CSS classes to format highlighted code
+pygmentsCodefencesGuessSyntax = true
+pygmentsOptions = "linenos=table"
+
 # language support en / zh-cn / other... translations present in i18n/
 defaultContentLanguage = "en"  # Default language to use (if you setup multilingual support)
 [langusges]
@@ -81,14 +95,6 @@ defaultContentLanguage = "en"  # Default language to use (if you setup multiling
   url = "https://gohugo.io"
 
 
-hasCJKLanguage = true     # has chinese/japanese/korean ? # 自动检测是否包含 中文\日文\韩文
-paginate = 5                                              # 首页每页显示的文章数
-rssLimit = 20             # Limit Entry Count to Rss file # 限制 Rss 文章输出数量
-disqusShortname = "xianmin12"      # disqus_shortname
-googleAnalytics = "UA-34199129-1"      # UA-XXXXXXXX-X
-copyright = ""            # default: author.name ↓        # 默认为下面配置的author.name ↓
-# uglyURLs = true
-
 [author]                  # essential                     # 必需
   name = "xianmin"
 

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -4,11 +4,6 @@ enableRobotsTXT = true
 enableEmoji = true
 theme = "jane"
 
-# language support # en / zh-cn / other... translations present in i18n/
-defaultContentLanguage = "en"           # Default language to use
-[languages.en]
-  languageCode = "en"
-
 hasCJKLanguage = true     # has chinese/japanese/korean ? # 自动检测是否包含 中文\日文\韩文
 paginate = 3                                              # 首页每页显示的文章数
 rssLimit = 20             # Limit Entry Count to Rss file # 限制 Rss 文章输出数量
@@ -17,6 +12,17 @@ googleAnalytics = ""      # UA-XXXXXXXX-X
 copyright = ""            # default: author.name ↓        # 默认为下面配置的author.name ↓
 # uglyURLs = true         # more info: https://gohugo.io/content-management/urls/#ugly-urls
 
+# Highlight options. See https://gohugo.io/content-management/syntax-highlighting/
+PygmentsCodeFences = true # Enable syntax highlighting with GitHub flavoured code fences
+PygmentsUseClasses = true # Use CSS classes to format highlighted code
+PygmentsCodefencesGuessSyntax = true
+PygmentsOptions = "linenos=table"
+
+# language support # en / zh-cn / other... translations present in i18n/
+defaultContentLanguage = "en"           # Default language to use
+[languages.en]
+  languageCode = "en"
+
 [author]                  # essential                     # 必需
   name = "xianmin"
 
@@ -154,4 +160,4 @@ copyright = ""            # default: author.name ↓        # 默认为下面配
 #   weight = 1
 # [languages.zh-cn]
 #   title = "Jane —— 一个简洁的 Hugo 主题"
-#   weight = 2
+#   weight = 2
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
@@ -1,5 +1,4 @@
 <!-- js -->
-<script src="{{ "lib/highlight/highlight.pack.js?v=20171001" | relURL }}"></script>
 {{ if .Site.Params.bootcdn -}}
   <script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js" crossorigin="anonymous"></script>
   <script type="text/javascript" src="https://cdn.bootcss.com/slideout/1.0.1/slideout.min.js" crossorigin="anonymous"></script>
@@ -73,4 +72,4 @@
 <!-- custom js -->
 {{ range .Site.Params.customJS }}
 <script src="{{ "/js/" | relURL }}{{ . }}"></script>
-{{ end }}
+{{ end }}