alyenc/hugo-theme-next
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Fixed #155, the code block overflow in the markdown file.

Browse Source
This commit is contained in:
elkan1788 2025-01-21 20:44:34 +08:00
parent 23e220b5f3
commit 65a7a9c536
4 changed files with 208 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
assets/css/_common/scaffolding/highlight/copy-code.scss
View File

@ -5,31 +5,130 @@
margin-bottom: 26px; margin-bottom: 26px;
line-height: 1.25; line-height: 1.25;
//TODO Need fixed the copy button show position. > .chroma {
div:first-child { position: relative;
overflow-x: auto;
}
pre { pre {
position: relative; padding: .45rem 0;
overflow-x: auto;
padding: 6px;
overflow-wrap: break-word;
line-break: anywhere;
} }
/* table tbody tr { .lntd:first-child {
//TODO Fixed the too long code line over min-width: 1.6rem;
// layout background color. text-align: right;
background: #272822; background-color: #272822;
}*/
/* pre > code span { a {
white-space: break-spaces; border-bottom: none;
overflow: hidden; }
}
.lntd:last-child {
width: 100%;
pre {
overflow-wrap: break-word;
white-space: pre-wrap;
line-break: anywhere;
word-break: break-all; word-break: break-all;
word-wrap: break-word; overflow-x: auto;
} */ }
}
> code > span {
overflow-wrap: break-word;
white-space: pre-wrap;
line-break: anywhere;
word-break: break-all;
}
}
/** monokai highlight style **/
/* Background */ .bg { color:#f8f8f2;background-color:#272822; }
/* PreWrapper */ .chroma { color:#f8f8f2;background-color:#272822; }
/* Other */ .chroma .x { }
/* Error */ .chroma .err { color:#960050;background-color:#1e0010 }
/* CodeLine */ .chroma .cl { }
/* LineLink */ .chroma .lnlinks { outline:none;text-decoration:none;color:inherit }
/* LineTableTD */ .chroma .lntd { vertical-align:top;padding:0;margin:0;border:0; }
/* LineTable */ .chroma .lntable { border-spacing:0;padding:0;margin:0;border:0; }
/* LineHighlight */ .chroma .hl { background-color:#3c3d38 }
/* LineNumbersTable */ .chroma .lnt { white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f }
/* LineNumbers */ .chroma .ln { white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f }
/* Line */ .chroma .line { display:flex; }
/* Keyword */ .chroma .k { color:#66d9ef }
/* KeywordConstant */ .chroma .kc { color:#66d9ef }
/* KeywordDeclaration */ .chroma .kd { color:#66d9ef }
/* KeywordNamespace */ .chroma .kn { color:#f92672 }
/* KeywordPseudo */ .chroma .kp { color:#66d9ef }
/* KeywordReserved */ .chroma .kr { color:#66d9ef }
/* KeywordType */ .chroma .kt { color:#66d9ef }
/* Name */ .chroma .n { }
/* NameAttribute */ .chroma .na { color:#a6e22e }
/* NameBuiltin */ .chroma .nb { }
/* NameBuiltinPseudo */ .chroma .bp { }
/* NameClass */ .chroma .nc { color:#a6e22e }
/* NameConstant */ .chroma .no { color:#66d9ef }
/* NameDecorator */ .chroma .nd { color:#a6e22e }
/* NameEntity */ .chroma .ni { }
/* NameException */ .chroma .ne { color:#a6e22e }
/* NameFunction */ .chroma .nf { color:#a6e22e }
/* NameFunctionMagic */ .chroma .fm { }
/* NameLabel */ .chroma .nl { }
/* NameNamespace */ .chroma .nn { }
/* NameOther */ .chroma .nx { color:#a6e22e }
/* NameProperty */ .chroma .py { }
/* NameTag */ .chroma .nt { color:#f92672 }
/* NameVariable */ .chroma .nv { }
/* NameVariableClass */ .chroma .vc { }
/* NameVariableGlobal */ .chroma .vg { }
/* NameVariableInstance */ .chroma .vi { }
/* NameVariableMagic */ .chroma .vm { }
/* Literal */ .chroma .l { color:#ae81ff }
/* LiteralDate */ .chroma .ld { color:#e6db74 }
/* LiteralString */ .chroma .s { color:#e6db74 }
/* LiteralStringAffix */ .chroma .sa { color:#e6db74 }
/* LiteralStringBacktick */ .chroma .sb { color:#e6db74 }
/* LiteralStringChar */ .chroma .sc { color:#e6db74 }
/* LiteralStringDelimiter */ .chroma .dl { color:#e6db74 }
/* LiteralStringDoc */ .chroma .sd { color:#e6db74 }
/* LiteralStringDouble */ .chroma .s2 { color:#e6db74 }
/* LiteralStringEscape */ .chroma .se { color:#ae81ff }
/* LiteralStringHeredoc */ .chroma .sh { color:#e6db74 }
/* LiteralStringInterpol */ .chroma .si { color:#e6db74 }
/* LiteralStringOther */ .chroma .sx { color:#e6db74 }
/* LiteralStringRegex */ .chroma .sr { color:#e6db74 }
/* LiteralStringSingle */ .chroma .s1 { color:#e6db74 }
/* LiteralStringSymbol */ .chroma .ss { color:#e6db74 }
/* LiteralNumber */ .chroma .m { color:#ae81ff }
/* LiteralNumberBin */ .chroma .mb { color:#ae81ff }
/* LiteralNumberFloat */ .chroma .mf { color:#ae81ff }
/* LiteralNumberHex */ .chroma .mh { color:#ae81ff }
/* LiteralNumberInteger */ .chroma .mi { color:#ae81ff }
/* LiteralNumberIntegerLong */ .chroma .il { color:#ae81ff }
/* LiteralNumberOct */ .chroma .mo { color:#ae81ff }
/* Operator */ .chroma .o { color:#f92672 }
/* OperatorWord */ .chroma .ow { color:#f92672 }
/* Punctuation */ .chroma .p { }
/* Comment */ .chroma .c { color:#75715e }
/* CommentHashbang */ .chroma .ch { color:#75715e }
/* CommentMultiline */ .chroma .cm { color:#75715e }
/* CommentSingle */ .chroma .c1 { color:#75715e }
/* CommentSpecial */ .chroma .cs { color:#75715e }
/* CommentPreproc */ .chroma .cp { color:#75715e }
/* CommentPreprocFile */ .chroma .cpf { color:#75715e }
/* Generic */ .chroma .g { }
/* GenericDeleted */ .chroma .gd { color:#f92672 }
/* GenericEmph */ .chroma .ge { font-style:italic }
/* GenericError */ .chroma .gr { }
/* GenericHeading */ .chroma .gh { }
/* GenericInserted */ .chroma .gi { color:#a6e22e }
/* GenericOutput */ .chroma .go { }
/* GenericPrompt */ .chroma .gp { }
/* GenericStrong */ .chroma .gs { font-weight:bold }
/* GenericSubheading */ .chroma .gu { color:#75715e }
/* GenericTraceback */ .chroma .gt { }
/* GenericUnderline */ .chroma .gl { }
/* TextWhitespace */ .chroma .w { }
} }
@if $codeblock_copy_btn_enable { @if $codeblock_copy_btn_enable {
@ -76,10 +175,7 @@
box-shadow: 0 10px 30px 0 rgba(0, 0, 0, .4); box-shadow: 0 10px 30px 0 rgba(0, 0, 0, .4);
padding-top: 30px; padding-top: 30px;
.table-container { > div {
border-radius: 0 0 5px 5px;
}
&::before { &::before {
background: #fc625d; background: #fc625d;
box-shadow: 20px 0 #fdbc40, 40px 0 #35cd4b; box-shadow: 20px 0 #fdbc40, 40px 0 #35cd4b;
@ -89,4 +185,5 @@
@include round-icon(12px); @include round-icon(12px);
} }
} }
}
} }

32
assets/js/3rd/others/clipboard.js
View File

@ -1,37 +1,35 @@
/* clipboard plugin */ /* clipboard plugin */
NexT.plugins.others.clipboard = function() { NexT.plugins.others.clipboard = function () {
const clipboard_js = NexT.utils.getCDNResource(NexT.CONFIG.page.clipboard.js); const clipboard_js = NexT.utils.getCDNResource(NexT.CONFIG.page.clipboard.js);
NexT.utils.getScript(clipboard_js, function(){ NexT.utils.getScript(clipboard_js, function () {
let figure = document.querySelectorAll('.highlight pre'); let figure = document.querySelectorAll('.highlight pre');
if (figure.length === 0 || !NexT.CONFIG.copybtn) return; if (figure.length === 0 || !NexT.CONFIG.copybtn) return;
/** Add copy button DOM. **/
figure.forEach(element => { figure.forEach(element => {
let cn = element.querySelector('code').className; let cn = element.querySelector('code').className;
if (cn === '') return; if (cn === '') return;
element.children[0].insertAdjacentHTML('beforebegin', '<div class="copy-btn" data-clipboard-snippe><i class="fa fa-copy fa-fw"></i></div>'); element.insertAdjacentHTML('beforeend', '<div class="copy-btn"><i class="fa fa-copy fa-fw"></i></div>');
var clipboard = new ClipboardJS(element.children[0], });
{
text: function(trigger) { /** Register the clipboard event. **/
return trigger.nextElementSibling.textContent.trim(); var clipboard = new ClipboardJS('.copy-btn', {
text: function (trigger) {
// TODO: Why there clipboard default text content with enter?
return trigger.previousElementSibling.textContent.trim();
} }
}); });
clipboard.on('success', function (e) { clipboard.on('success', function (e) {
e.clearSelection(); e.clearSelection();
button.querySelector('i').className = 'fa fa-check-circle fa-fw'; e.trigger.querySelector('i').className = 'fa fa-fw fa-check-circle';
}); });
clipboard.on('error', function (e) { clipboard.on('error', function (e) {
console.error('Copy failed:', e); console.error('Copy failed:', e);
button.querySelector('i').className = 'fa fa-times-circle fa-fw'; e.trigger.querySelector('i').className = 'fa fa-fw fa-times-circle';
});
const button = element.querySelector('.copy-btn');
element.addEventListener('mouseleave', () => {
setTimeout(() => {
button.querySelector('i').className = 'fa fa-copy fa-fw';
}, 300);
});
}); });
}); });
} }

20
exampleSite/config.yaml
View File

@ -39,25 +39,15 @@ markup:
goldmark: goldmark:
renderer: renderer:
unsafe: true unsafe: true
# 高亮代码的样式
# Highlight style of code
highlight: highlight:
# # 高亮代码的样式名称，可选：monokai | emacs | api | dracula | friendly
# # 更多的样式：https://xyproto.github.io/splash/docs/all.html
# # Highlight style: monokai | emacs | api | dracula | friendly
# # More: https://xyproto.github.io/splash/docs/all.html
# style: "monokai"
anchorLineNos: true anchorLineNos: true
codeFences: true codeFences: true
guessSyntax: true guessSyntax: true
hl_Lines: "" lineNos: true
hl_inline: false lineNumbersInTable: true
lineAnchors: "" noClasses: false
lineNoStart: 1
lineNos: false
lineNumbersInTable: false
noClasses: true
noHl: false
style: monokai
tabWidth: 2
tableOfContents: tableOfContents:
# 开始/结束标题级别：1-6 (建议从2开始) # 开始/结束标题级别：1-6 (建议从2开始)
# Heading title level of start or end: 1-6 # Heading title level of start or end: 1-6

42
exampleSite/content/post/syntax-highlighting.md
View File

@ -27,6 +27,23 @@ Hugo 通过 Chroma 提供非常快速的语法高亮显示，现 Hugo 中使用
### GO ### GO
```makrdown
{{</* highlight go "linenos=table,hl_lines=8 15-17,linenostart=199" */>}}
func GetTitleFunc(style string) func(s string) string {
switch strings.ToLower(style) {
case "go":
return strings.Title
case "chicago":
return transform.NewTitleConverter(transform.ChicagoStyle)
default:
return transform.NewTitleConverter(transform.APStyle)
}
}
{{</* / highlight */>}}
```
{{< highlight go "linenos=table,hl_lines=8 15-17,linenostart=199" >}} {{< highlight go "linenos=table,hl_lines=8 15-17,linenostart=199" >}}
func GetTitleFunc(style string) func(s string) string { func GetTitleFunc(style string) func(s string) string {
@ -143,5 +160,30 @@ FROM
WHERE column_name = "condition" WHERE column_name = "condition"
{{< / highlight >}} {{< / highlight >}}
### 自动猜测代码高亮显示
```
.highlight {
// 其他代码
......
> .chroma {
position: relative;
// 修复代码块溢出问题
pre {
overflow-wrap: break-word;
white-space: pre-wrap;
line-break: anywhere;
word-break: break-all;
overflow-x: auto;
}
}
}
}
```
除以上列举的代码高亮显示外，还支持诸如：C 语言、C++、HTML、CSS、Shell脚本等各主流的代码语言高亮显示，可自行测试效果。 除以上列举的代码高亮显示外，还支持诸如：C 语言、C++、HTML、CSS、Shell脚本等各主流的代码语言高亮显示，可自行测试效果。