diff --git a/assets/css/_common/scaffolding/highlight/copy-code.scss b/assets/css/_common/scaffolding/highlight/copy-code.scss index 369854f..63d538c 100644 --- a/assets/css/_common/scaffolding/highlight/copy-code.scss +++ b/assets/css/_common/scaffolding/highlight/copy-code.scss @@ -1,6 +1,3 @@ -.highlight:hover .copy-btn, pre:hover .copy-btn { - opacity: 1; -} .highlight { @@ -15,38 +12,45 @@ } } -.copy-btn { - color: $black-dim; - cursor: pointer; - line-height: 1.6; - opacity: 0; - padding: 2px 6px; - position: absolute; - right: 8px; - top: 4px; - transition: opacity $transition-ease; - background: var(--highlight-background); +@if $codeblock_copy_btn_enable { - @if $codeblock_copy_btn_style == 'flat' { - background: white; - border: 0; - font-size: $font-size-smaller; - - } @else if $codeblock_copy_btn_style == 'mac' { - color: var(--highlight-foreground); - font-size: 14px; - border-radius: 3px; - } @else { - background-color: $gainsboro; - background-image: linear-gradient(#fcfcfc, $gainsboro); - border: 1px solid #d5d5d5; - border-radius: 3px; - font-size: $font-size-smaller; - + .highlight:hover .copy-btn, pre:hover .copy-btn { + opacity: 1; + } + + .copy-btn { + color: $black-dim; + cursor: pointer; + line-height: 1.6; + opacity: 0; + padding: 2px 6px; + position: absolute; + right: 8px; + top: 4px; + transition: opacity $transition-ease; + background: var(--highlight-background); + + @if $codeblock_style == 'flat' { + background: white; + border: 0; + font-size: $font-size-smaller; + + } @else if $codeblock_style == 'mac' { + color: var(--highlight-foreground); + font-size: 14px; + border-radius: 3px; + } @else { + background-color: $gainsboro; + background-image: linear-gradient(#fcfcfc, $gainsboro); + border: 1px solid #d5d5d5; + border-radius: 3px; + font-size: $font-size-smaller; + + } } } -@if $codeblock_copy_btn_style == 'mac' { +@if $codeblock_style == 'mac' { .highlight { border-radius: 5px; box-shadow: 0 10px 30px 0 rgba(0, 0, 0, .4); @@ -65,4 +69,4 @@ @include round-icon(12px); } } -} +} \ No newline at end of file diff --git a/assets/css/main.scss b/assets/css/main.scss index 5f4f2d2..cb1031d 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -52,7 +52,8 @@ $highlight_dark_foreground : #fff; $highlight_light_background : #565656; $highlight_light_foreground : #fff; -$codeblock_copy_btn_style : {{ $P.codeblock.copyBtn.style }}; +$codeblock_copy_btn_enable : {{ $P.codeblock.copyBtn }}; +$codeblock_style : {{ $P.codeblock.style }}; // Sidebar $sidebar_offset : {{ $P.sidebar.offset }}; @@ -113,7 +114,9 @@ $reading_progress_reversed : {{ $P.readingProgress.reversed }}; // Thirdparty $math_mathjax_enable : {{ $P.math.mathjax.enable }}; -$related_posts_enable : {{ $P.relatedPosts.enable }}; +// TODO +//$related_posts_enable : {{ $P.relatedPosts.enable }}; +$related_posts_enable : false; $pdf_enable : {{ $P.pdf.enable }}; $pdf_height : {{ $P.pdf.height }}; diff --git a/assets/js/config.js b/assets/js/config.js index 992939b..e67c69c 100644 --- a/assets/js/config.js +++ b/assets/js/config.js @@ -10,7 +10,7 @@ if (!window.NexT) window.NexT = {}; "darkmode" : {{ .Site.Params.darkmode }}, "version" : "{{ .Site.Data.config.version }}", "sidebar" : {{ .Site.Params.sidebar | jsonify }}, - "copycode" : {{ .Site.Params.codeblock.copyBtn | jsonify }}, + "copybtn" : {{ .Site.Params.codeblock.copyBtn }}, "bookmark" : {{ .Site.Params.bookmark | jsonify }}, "comments" : {{ .Site.Params.comments | jsonify }}, "mediumzoom" : {{ .Site.Params.mediumzoom }}, diff --git a/assets/js/next-boot.js b/assets/js/next-boot.js index a37e40e..66bb821 100644 --- a/assets/js/next-boot.js +++ b/assets/js/next-boot.js @@ -45,7 +45,7 @@ NexT.boot.refresh = function() { CONFIG.pangu && window.pangu.spacingPage(); CONFIG.isPage && NexT.utils.replacePostCRLink(); - CONFIG.isPage && NexT.utils.registerCopyCode(); + CONFIG.isPage && CONFIG.copybtn && NexT.utils.registerCopyCode(); NexT.utils.registerTabsTag(); /*NexT.utils.registerActiveMenuItem(); NexT.utils.registerLangSelect();*/ diff --git a/assets/js/utils.js b/assets/js/utils.js index 0a80fc2..3baa4de 100644 --- a/assets/js/utils.js +++ b/assets/js/utils.js @@ -41,7 +41,7 @@ NexT.utils = { */ registerCopyCode: function() { let figure = document.querySelectorAll('.highlight pre'); - if (figure.length === 0 || !CONFIG.copycode) return; + if (figure.length === 0 || !CONFIG.copybtn) return; figure.forEach(element => { let cn = element.querySelector('code').className; // TODO seems hard code need find other ways fixed it.