mirror of
https://github.com/flysnow-org/maupassant-hugo.git
synced 2026-08-24 15:28:55 +00:00
remove js highlight,use hugo Syntax Highlighting,fix hugo v0.60.0+ Syntax Highlighting bugs.close #72,close #73
This commit is contained in:
飞雪无情
@@ -26,10 +26,6 @@ Maupassant theme, ported to Hugo.
|
||||
9. 支持GA分析统计
|
||||
17. 不蒜子页面计数器支持
|
||||
11. 代码高亮、代码行号
|
||||
* markup、css、clike、javascript、c、csharp、bash、cpp
|
||||
* aspnet、dart、docker、markup-templating、erlang
|
||||
* go、groovy、java、json、kotlin、markdown、lua、objectivec
|
||||
* php、python、r、yaml、toml
|
||||
10. sitemap站点地图
|
||||
5. RSS支持，并且可以自动发现RSS
|
||||
14. Google站内搜索
|
||||
@@ -82,10 +78,35 @@ summaryLength = 140
|
||||
description = "专注于IT互联网，包括但不限于Go语言(golang)、Java、Android、Python、项目管理、抖音分析、软件架构等"
|
||||
busuanzi = true
|
||||
localSearch = true
|
||||
|
||||
[markup]
|
||||
[markup.highlight]
|
||||
lineNos = true
|
||||
style = "github"
|
||||
```
|
||||
|
||||
基本配置大家都比较熟悉，这是我的博客的配置，仅供参考。
|
||||
|
||||
#### 代码高亮
|
||||
|
||||
从Hugo v0.60.0开始，默认使用`Goldmark`渲染MD文件，并且默认开启了代码高亮，所以该主题原来的代码高亮兼容出现问题，
|
||||
经过取舍，最终还是选用了Hugo原生的代码高亮方式，去掉了原来主题自带的基于JS的代码高亮。
|
||||
|
||||
新的Hugo内置的代码高亮使用非常代码，默认不用任何配置就可以，如果你需要开启行号、或者更换代码样式，可以参考如下配置：
|
||||
|
||||
*config.toml*
|
||||
```toml
|
||||
[markup]
|
||||
[markup.highlight]
|
||||
lineNos = true
|
||||
style = "github"
|
||||
```
|
||||
|
||||
更多配合和样式参考:
|
||||
|
||||
[Configure Markup](https://gohugo.io/getting-started/configuration-markup)
|
||||
[Syntax Highlighting](https://gohugo.io/content-management/syntax-highlighting/)
|
||||
|
||||
#### 自定义菜单
|
||||
|
||||
```toml
|
||||
|
||||
@@ -103,11 +103,6 @@
|
||||
{{- end -}}
|
||||
|
||||
<script type="text/javascript">
|
||||
//添加行号
|
||||
(function () {
|
||||
$("pre code").parent().addClass("line-numbers")
|
||||
}());
|
||||
|
||||
window.MathJax = {
|
||||
tex2jax: {
|
||||
inlineMath: [['$', '$']],
|
||||
@@ -115,7 +110,6 @@
|
||||
}
|
||||
};
|
||||
</script>
|
||||
<script type="text/javascript" src="{{ "js/prism.js" | relURL}}" async="true"></script>
|
||||
<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML' async></script>
|
||||
{{ end }}
|
||||
|
||||
|
||||
@@ -35,9 +35,6 @@
|
||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
|
||||
|
||||
<link rel="stylesheet" href="{{ "css/normalize.css" | relURL}}">
|
||||
{{ if .IsPage }}
|
||||
<link rel="stylesheet" href="{{ "css/prism.css" | relURL }}">
|
||||
{{ end }}
|
||||
<link rel="stylesheet" href="{{ "css/style.css" | relURL }}">
|
||||
{{ range .AlternativeOutputFormats -}}
|
||||
{{ printf `<link rel="%s" type="%s+%s" href="%s" title="%s" />` .Rel .MediaType.Type .MediaType.Suffix .Permalink $.Site.Title | safeHTML }}
|
||||
|
||||
@@ -1,249 +0,0 @@
|
||||
/* PrismJS 1.17.1
|
||||
https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript+c+csharp+bash+cpp+aspnet+dart+markup-templating+docker+lua+erlang+go+groovy+java+php+markdown+json+kotlin+objectivec+python+r+yaml+toml&plugins=line-numbers+toolbar+highlight-keywords+copy-to-clipboard */
|
||||
/**
|
||||
* prism.js default theme for JavaScript, CSS and HTML
|
||||
* Based on dabblet (http://dabblet.com)
|
||||
* @author Lea Verou
|
||||
*/
|
||||
|
||||
code[class*="language-"],
|
||||
pre[class*="language-"] {
|
||||
color: black;
|
||||
background: none;
|
||||
text-shadow: 0 1px white;
|
||||
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
|
||||
font-size: 1em;
|
||||
text-align: left;
|
||||
white-space: pre;
|
||||
word-spacing: normal;
|
||||
word-break: normal;
|
||||
word-wrap: normal;
|
||||
line-height: 1.5;
|
||||
|
||||
-moz-tab-size: 4;
|
||||
-o-tab-size: 4;
|
||||
tab-size: 4;
|
||||
|
||||
-webkit-hyphens: none;
|
||||
-moz-hyphens: none;
|
||||
-ms-hyphens: none;
|
||||
hyphens: none;
|
||||
}
|
||||
|
||||
pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
|
||||
code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
|
||||
text-shadow: none;
|
||||
background: #b3d4fc;
|
||||
}
|
||||
|
||||
pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
|
||||
code[class*="language-"]::selection, code[class*="language-"] ::selection {
|
||||
text-shadow: none;
|
||||
background: #b3d4fc;
|
||||
}
|
||||
|
||||
@media print {
|
||||
code[class*="language-"],
|
||||
pre[class*="language-"] {
|
||||
text-shadow: none;
|
||||
}
|
||||
}
|
||||
|
||||
/* Code blocks */
|
||||
pre[class*="language-"] {
|
||||
padding: 1em;
|
||||
margin: .5em 0;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
:not(pre) > code[class*="language-"],
|
||||
pre[class*="language-"] {
|
||||
background: #f5f2f0;
|
||||
}
|
||||
|
||||
/* Inline code */
|
||||
:not(pre) > code[class*="language-"] {
|
||||
padding: .1em;
|
||||
border-radius: .3em;
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
.token.comment,
|
||||
.token.prolog,
|
||||
.token.doctype,
|
||||
.token.cdata {
|
||||
color: slategray;
|
||||
}
|
||||
|
||||
.token.punctuation {
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.namespace {
|
||||
opacity: .7;
|
||||
}
|
||||
|
||||
.token.property,
|
||||
.token.tag,
|
||||
.token.boolean,
|
||||
.token.number,
|
||||
.token.constant,
|
||||
.token.symbol,
|
||||
.token.deleted {
|
||||
color: #905;
|
||||
}
|
||||
|
||||
.token.selector,
|
||||
.token.attr-name,
|
||||
.token.string,
|
||||
.token.char,
|
||||
.token.builtin,
|
||||
.token.inserted {
|
||||
color: #690;
|
||||
}
|
||||
|
||||
.token.operator,
|
||||
.token.entity,
|
||||
.token.url,
|
||||
.language-css .token.string,
|
||||
.style .token.string {
|
||||
color: #9a6e3a;
|
||||
background: hsla(0, 0%, 100%, .5);
|
||||
}
|
||||
|
||||
.token.atrule,
|
||||
.token.attr-value,
|
||||
.token.keyword {
|
||||
color: #07a;
|
||||
}
|
||||
|
||||
.token.function,
|
||||
.token.class-name {
|
||||
color: #DD4A68;
|
||||
}
|
||||
|
||||
.token.regex,
|
||||
.token.important,
|
||||
.token.variable {
|
||||
color: #e90;
|
||||
}
|
||||
|
||||
.token.important,
|
||||
.token.bold {
|
||||
font-weight: bold;
|
||||
}
|
||||
.token.italic {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.token.entity {
|
||||
cursor: help;
|
||||
}
|
||||
|
||||
pre[class*="language-"].line-numbers {
|
||||
position: relative;
|
||||
padding-left: 3.8em;
|
||||
counter-reset: linenumber;
|
||||
}
|
||||
|
||||
pre[class*="language-"].line-numbers > code {
|
||||
position: relative;
|
||||
white-space: inherit;
|
||||
}
|
||||
|
||||
.line-numbers .line-numbers-rows {
|
||||
position: absolute;
|
||||
pointer-events: none;
|
||||
top: 0;
|
||||
font-size: 100%;
|
||||
left: -3.8em;
|
||||
width: 3em; /* works for line-numbers below 1000 lines */
|
||||
letter-spacing: -1px;
|
||||
border-right: 1px solid #999;
|
||||
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
|
||||
}
|
||||
|
||||
.line-numbers-rows > span {
|
||||
pointer-events: none;
|
||||
display: block;
|
||||
counter-increment: linenumber;
|
||||
}
|
||||
|
||||
.line-numbers-rows > span:before {
|
||||
content: counter(linenumber);
|
||||
color: #999;
|
||||
display: block;
|
||||
padding-right: 0.8em;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
div.code-toolbar {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
div.code-toolbar > .toolbar {
|
||||
position: absolute;
|
||||
top: .3em;
|
||||
right: .2em;
|
||||
transition: opacity 0.3s ease-in-out;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
div.code-toolbar:hover > .toolbar {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
/* Separate line b/c rules are thrown out if selector is invalid.
|
||||
IE11 and old Edge versions don't support :focus-within. */
|
||||
div.code-toolbar:focus-within > .toolbar {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
div.code-toolbar > .toolbar .toolbar-item {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
div.code-toolbar > .toolbar a {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
div.code-toolbar > .toolbar button {
|
||||
background: none;
|
||||
border: 0;
|
||||
color: inherit;
|
||||
font: inherit;
|
||||
line-height: normal;
|
||||
overflow: visible;
|
||||
padding: 0;
|
||||
-webkit-user-select: none; /* for button */
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
}
|
||||
|
||||
div.code-toolbar > .toolbar a,
|
||||
div.code-toolbar > .toolbar button,
|
||||
div.code-toolbar > .toolbar span {
|
||||
color: #bbb;
|
||||
font-size: .8em;
|
||||
padding: 0 .5em;
|
||||
background: #f5f2f0;
|
||||
background: rgba(224, 224, 224, 0.2);
|
||||
box-shadow: 0 2px 0 0 rgba(0,0,0,0.2);
|
||||
border-radius: .5em;
|
||||
}
|
||||
|
||||
div.code-toolbar > .toolbar a:hover,
|
||||
div.code-toolbar > .toolbar a:focus,
|
||||
div.code-toolbar > .toolbar button:hover,
|
||||
div.code-toolbar > .toolbar button:focus,
|
||||
div.code-toolbar > .toolbar span:hover,
|
||||
div.code-toolbar > .toolbar span:focus {
|
||||
color: inherit;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
+3
-11
@@ -99,12 +99,10 @@ mark {
|
||||
background: #fffdd1;
|
||||
}
|
||||
pre, code {
|
||||
background:#f8f8f8;
|
||||
font-family:Menlo, Monaco, Consolas, "Lucida Console", "Courier New", monospace;
|
||||
font-size:.92857em;
|
||||
}
|
||||
pre {
|
||||
margin: 2em 0;
|
||||
overflow:auto;
|
||||
border: 1px solid #ddd;
|
||||
display: block;
|
||||
@@ -374,17 +372,11 @@ textarea {
|
||||
border-bottom: 1px solid #eee;
|
||||
overflow: hidden;
|
||||
}
|
||||
/* .post-content pre, .comment-content pre {
|
||||
max-height: 320px;
|
||||
} */
|
||||
.post-content pre, .comment-content pre {
|
||||
padding: 1em 1.5em;
|
||||
.post-content pre{
|
||||
padding: 1em;
|
||||
}
|
||||
.post-content p code, .comment-content p code {
|
||||
.post-content code{
|
||||
display:inline;
|
||||
margin:0 5px;
|
||||
padding:3px 5px;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
.post-content p {
|
||||
margin:0 0 1.1em;
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user