diff --git a/assets/css/_core/_base.scss b/assets/css/_core/_base.scss index 4bec533e..5fbe2fe1 100644 --- a/assets/css/_core/_base.scss +++ b/assets/css/_core/_base.scss @@ -90,9 +90,4 @@ details { @include link(true, true); -@import '../_partials/scrollbar'; -@import '../_partials/mask'; -@import '../_partials/img'; -@import '../_partials/icon'; -@import '../_partials/details'; -@import '../_partials/widgets'; +@import '../_widgets'; diff --git a/assets/css/_partials/_maps/_admonition.scss b/assets/css/_maps/_admonition.scss similarity index 100% rename from assets/css/_partials/_maps/_admonition.scss rename to assets/css/_maps/_admonition.scss diff --git a/assets/css/_partials/_maps/_alert.scss b/assets/css/_maps/_alert.scss similarity index 100% rename from assets/css/_partials/_maps/_alert.scss rename to assets/css/_maps/_alert.scss diff --git a/assets/css/_partials/_maps/_code-type.scss b/assets/css/_maps/_code-type.scss similarity index 100% rename from assets/css/_partials/_maps/_code-type.scss rename to assets/css/_maps/_code-type.scss diff --git a/assets/css/_partials/_maps/_colors.scss b/assets/css/_maps/_colors.scss similarity index 100% rename from assets/css/_partials/_maps/_colors.scss rename to assets/css/_maps/_colors.scss diff --git a/assets/css/_partials/_maps/_utilities.scss b/assets/css/_maps/_utilities.scss similarity index 100% rename from assets/css/_partials/_maps/_utilities.scss rename to assets/css/_maps/_utilities.scss diff --git a/assets/css/_page/_archive.scss b/assets/css/_page/_archive/_index.scss similarity index 83% rename from assets/css/_page/_archive.scss rename to assets/css/_page/_archive/_index.scss index 43193a80..a9eb2bda 100644 --- a/assets/css/_page/_archive.scss +++ b/assets/css/_page/_archive/_index.scss @@ -22,6 +22,6 @@ margin-bottom: 1rem; } - @import '../_partials/_archive/terms'; - @import '../_partials/_archive/tags'; + @import 'terms'; + @import 'tags'; } diff --git a/assets/css/_partials/_archive/_tags.scss b/assets/css/_page/_archive/_tags.scss similarity index 100% rename from assets/css/_partials/_archive/_tags.scss rename to assets/css/_page/_archive/_tags.scss diff --git a/assets/css/_partials/_archive/_terms.scss b/assets/css/_page/_archive/_terms.scss similarity index 100% rename from assets/css/_partials/_archive/_terms.scss rename to assets/css/_page/_archive/_terms.scss diff --git a/assets/css/_page/_index.scss b/assets/css/_page/_index.scss index f09281d3..8df67ed5 100644 --- a/assets/css/_page/_index.scss +++ b/assets/css/_page/_index.scss @@ -14,6 +14,6 @@ @import '_single'; @import '_special'; @import '_archive'; -@import '_home'; -@import '_404'; -@import '_offline'; +@import 'home'; +@import '404'; +@import 'offline'; diff --git a/assets/css/_partials/_single/_alert.scss b/assets/css/_page/_single/_alert.scss similarity index 100% rename from assets/css/_partials/_single/_alert.scss rename to assets/css/_page/_single/_alert.scss diff --git a/assets/css/_partials/_code-syntax/_dark.scss b/assets/css/_page/_single/_code-syntax/_dark.scss similarity index 100% rename from assets/css/_partials/_code-syntax/_dark.scss rename to assets/css/_page/_single/_code-syntax/_dark.scss diff --git a/assets/css/_partials/_code-syntax/_github-dark-dimmed.scss b/assets/css/_page/_single/_code-syntax/_github-dark-dimmed.scss similarity index 100% rename from assets/css/_partials/_code-syntax/_github-dark-dimmed.scss rename to assets/css/_page/_single/_code-syntax/_github-dark-dimmed.scss diff --git a/assets/css/_partials/_code-syntax/_index.scss b/assets/css/_page/_single/_code-syntax/_index.scss similarity index 91% rename from assets/css/_partials/_code-syntax/_index.scss rename to assets/css/_page/_single/_code-syntax/_index.scss index cf8d4488..b2ec6e22 100644 --- a/assets/css/_partials/_code-syntax/_index.scss +++ b/assets/css/_page/_single/_code-syntax/_index.scss @@ -21,9 +21,9 @@ box-shadow: -0.75rem 0 0 var(#{$rootPrefix}code-highlight-color), 0.75rem 0 0 var(#{$rootPrefix}code-highlight-color); } - @import '../_code-syntax/light'; + @import 'light'; [data-theme='dark'] & { - @import '../_code-syntax/dark'; + @import 'dark'; } } diff --git a/assets/css/_partials/_code-syntax/_light.scss b/assets/css/_page/_single/_code-syntax/_light.scss similarity index 100% rename from assets/css/_partials/_code-syntax/_light.scss rename to assets/css/_page/_single/_code-syntax/_light.scss diff --git a/assets/css/_partials/_single/_code.scss b/assets/css/_page/_single/_code.scss similarity index 99% rename from assets/css/_partials/_single/_code.scss rename to assets/css/_page/_single/_code.scss index 325093a9..81f919d3 100644 --- a/assets/css/_partials/_single/_code.scss +++ b/assets/css/_page/_single/_code.scss @@ -461,7 +461,7 @@ pre { } } -@import '../_code-syntax/index'; +@import './_code-syntax'; // gist shortcode .gist { @@ -506,6 +506,6 @@ pre { } [data-theme='dark'] & { - @import '../_code-syntax/github-dark-dimmed'; + @import './_code-syntax/github-dark-dimmed'; } } diff --git a/assets/css/_partials/_single/_collections.scss b/assets/css/_page/_single/_collections.scss similarity index 100% rename from assets/css/_partials/_single/_collections.scss rename to assets/css/_page/_single/_collections.scss diff --git a/assets/css/_partials/_single/_color-preview.scss b/assets/css/_page/_single/_color-preview.scss similarity index 100% rename from assets/css/_partials/_single/_color-preview.scss rename to assets/css/_page/_single/_color-preview.scss diff --git a/assets/css/_partials/_single/_comment.scss b/assets/css/_page/_single/_comment.scss similarity index 100% rename from assets/css/_partials/_single/_comment.scss rename to assets/css/_page/_single/_comment.scss diff --git a/assets/css/_partials/_single/_diagram-copy-btn.scss b/assets/css/_page/_single/_diagram-copy-btn.scss similarity index 100% rename from assets/css/_partials/_single/_diagram-copy-btn.scss rename to assets/css/_page/_single/_diagram-copy-btn.scss diff --git a/assets/css/_partials/_single/_fixit-decryptor.scss b/assets/css/_page/_single/_fixit-decryptor.scss similarity index 100% rename from assets/css/_partials/_single/_fixit-decryptor.scss rename to assets/css/_page/_single/_fixit-decryptor.scss diff --git a/assets/css/_partials/_single/_footer.scss b/assets/css/_page/_single/_footer.scss similarity index 100% rename from assets/css/_partials/_single/_footer.scss rename to assets/css/_page/_single/_footer.scss diff --git a/assets/css/_page/_single.scss b/assets/css/_page/_single/_index.scss similarity index 95% rename from assets/css/_page/_single.scss rename to assets/css/_page/_single/_index.scss index d4005aeb..05860d1c 100644 --- a/assets/css/_page/_single.scss +++ b/assets/css/_page/_single/_index.scss @@ -1,8 +1,8 @@ -@import '../_partials/_single/toc'; -@import '../_partials/_single/fixit-decryptor'; -@import '../_partials/_single/collections'; -@import '../_partials/_single/related'; -@import '../_partials/_single/color-preview'; +@import 'toc'; +@import 'fixit-decryptor'; +@import 'collections'; +@import 'related'; +@import 'color-preview'; .single { .single-title { @@ -511,14 +511,13 @@ } } - // TODO Reorganization import - @import '../_shortcodes'; - @import '../_partials/_single/alert'; - @import '../_partials/_single/code'; - @import '../_partials/_single/diagram-copy-btn'; - @import '../_partials/_single/reward'; - @import '../_partials/_single/footer'; - @import '../_partials/_single/comment'; + @import '_shortcodes'; + @import 'alert'; + @import 'code'; + @import 'diagram-copy-btn'; + @import 'reward'; + @import 'footer'; + @import 'comment'; } .lg-toolbar .lg-icon::after { diff --git a/assets/css/_partials/_single/_related.scss b/assets/css/_page/_single/_related.scss similarity index 100% rename from assets/css/_partials/_single/_related.scss rename to assets/css/_page/_single/_related.scss diff --git a/assets/css/_partials/_single/_reward.scss b/assets/css/_page/_single/_reward.scss similarity index 100% rename from assets/css/_partials/_single/_reward.scss rename to assets/css/_page/_single/_reward.scss diff --git a/assets/css/_shortcodes/_admonition.scss b/assets/css/_page/_single/_shortcodes/_admonition.scss similarity index 100% rename from assets/css/_shortcodes/_admonition.scss rename to assets/css/_page/_single/_shortcodes/_admonition.scss diff --git a/assets/css/_shortcodes/_bilibili.scss b/assets/css/_page/_single/_shortcodes/_bilibili.scss similarity index 100% rename from assets/css/_shortcodes/_bilibili.scss rename to assets/css/_page/_single/_shortcodes/_bilibili.scss diff --git a/assets/css/_shortcodes/_bluesky.scss b/assets/css/_page/_single/_shortcodes/_bluesky.scss similarity index 100% rename from assets/css/_shortcodes/_bluesky.scss rename to assets/css/_page/_single/_shortcodes/_bluesky.scss diff --git a/assets/css/_shortcodes/_cardlink.scss b/assets/css/_page/_single/_shortcodes/_cardlink.scss similarity index 100% rename from assets/css/_shortcodes/_cardlink.scss rename to assets/css/_page/_single/_shortcodes/_cardlink.scss diff --git a/assets/css/_shortcodes/_center-quote.scss b/assets/css/_page/_single/_shortcodes/_center-quote.scss similarity index 100% rename from assets/css/_shortcodes/_center-quote.scss rename to assets/css/_page/_single/_shortcodes/_center-quote.scss diff --git a/assets/css/_shortcodes/_douyin.scss b/assets/css/_page/_single/_shortcodes/_douyin.scss similarity index 100% rename from assets/css/_shortcodes/_douyin.scss rename to assets/css/_page/_single/_shortcodes/_douyin.scss diff --git a/assets/css/_shortcodes/_echarts.scss b/assets/css/_page/_single/_shortcodes/_echarts.scss similarity index 100% rename from assets/css/_shortcodes/_echarts.scss rename to assets/css/_page/_single/_shortcodes/_echarts.scss diff --git a/assets/css/_shortcodes/_file-tree.scss b/assets/css/_page/_single/_shortcodes/_file-tree.scss similarity index 100% rename from assets/css/_shortcodes/_file-tree.scss rename to assets/css/_page/_single/_shortcodes/_file-tree.scss diff --git a/assets/css/_shortcodes/_index.scss b/assets/css/_page/_single/_shortcodes/_index.scss similarity index 100% rename from assets/css/_shortcodes/_index.scss rename to assets/css/_page/_single/_shortcodes/_index.scss diff --git a/assets/css/_shortcodes/_instagram.scss b/assets/css/_page/_single/_shortcodes/_instagram.scss similarity index 100% rename from assets/css/_shortcodes/_instagram.scss rename to assets/css/_page/_single/_shortcodes/_instagram.scss diff --git a/assets/css/_shortcodes/_mapbox.scss b/assets/css/_page/_single/_shortcodes/_mapbox.scss similarity index 100% rename from assets/css/_shortcodes/_mapbox.scss rename to assets/css/_page/_single/_shortcodes/_mapbox.scss diff --git a/assets/css/_shortcodes/_mermaid.scss b/assets/css/_page/_single/_shortcodes/_mermaid.scss similarity index 100% rename from assets/css/_shortcodes/_mermaid.scss rename to assets/css/_page/_single/_shortcodes/_mermaid.scss diff --git a/assets/css/_shortcodes/_tabs.scss b/assets/css/_page/_single/_shortcodes/_tabs.scss similarity index 100% rename from assets/css/_shortcodes/_tabs.scss rename to assets/css/_page/_single/_shortcodes/_tabs.scss diff --git a/assets/css/_shortcodes/_timeline.scss b/assets/css/_page/_single/_shortcodes/_timeline.scss similarity index 100% rename from assets/css/_shortcodes/_timeline.scss rename to assets/css/_page/_single/_shortcodes/_timeline.scss diff --git a/assets/css/_shortcodes/_version.scss b/assets/css/_page/_single/_shortcodes/_version.scss similarity index 100% rename from assets/css/_shortcodes/_version.scss rename to assets/css/_page/_single/_shortcodes/_version.scss diff --git a/assets/css/_partials/_single/_toc.scss b/assets/css/_page/_single/_toc.scss similarity index 100% rename from assets/css/_partials/_single/_toc.scss rename to assets/css/_page/_single/_toc.scss diff --git a/assets/css/_partials/_widgets.scss b/assets/css/_partials/_widgets.scss deleted file mode 100644 index 5262e1a9..00000000 --- a/assets/css/_partials/_widgets.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import '_widgets/cookieconsent'; -@import '_widgets/fixed-button'; -@import '_widgets/github-corner'; -@import '_widgets/noscript-warning'; -@import '_widgets/post-chat'; -@import '_widgets/reading-progress'; -@import '_widgets/typeit'; diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index 0ce53cf9..ccc12d6c 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -184,8 +184,8 @@ $github-corner-fill: $header-background-color-dark !default; $github-corner-fill-dark: $header-background-color !default; // ========== GitHub Corners ========== // -@import '_partials/_maps/admonition'; -@import '_partials/_maps/alert'; -@import '_partials/_maps/code-type'; -@import '_partials/_maps/colors'; -@import '_partials/_maps/utilities'; +@import '_maps/admonition'; +@import '_maps/alert'; +@import '_maps/code-type'; +@import '_maps/colors'; +@import '_maps/utilities'; diff --git a/assets/css/_partials/_widgets/_cookieconsent.scss b/assets/css/_widgets/_cookieconsent.scss similarity index 100% rename from assets/css/_partials/_widgets/_cookieconsent.scss rename to assets/css/_widgets/_cookieconsent.scss diff --git a/assets/css/_partials/_details.scss b/assets/css/_widgets/_details.scss similarity index 100% rename from assets/css/_partials/_details.scss rename to assets/css/_widgets/_details.scss diff --git a/assets/css/_partials/_widgets/_fixed-button.scss b/assets/css/_widgets/_fixed-button.scss similarity index 100% rename from assets/css/_partials/_widgets/_fixed-button.scss rename to assets/css/_widgets/_fixed-button.scss diff --git a/assets/css/_partials/_widgets/_github-corner.scss b/assets/css/_widgets/_github-corner.scss similarity index 100% rename from assets/css/_partials/_widgets/_github-corner.scss rename to assets/css/_widgets/_github-corner.scss diff --git a/assets/css/_partials/_icon.scss b/assets/css/_widgets/_icon.scss similarity index 100% rename from assets/css/_partials/_icon.scss rename to assets/css/_widgets/_icon.scss diff --git a/assets/css/_partials/_img.scss b/assets/css/_widgets/_img.scss similarity index 100% rename from assets/css/_partials/_img.scss rename to assets/css/_widgets/_img.scss diff --git a/assets/css/_widgets/_index.scss b/assets/css/_widgets/_index.scss new file mode 100644 index 00000000..fa6f91b3 --- /dev/null +++ b/assets/css/_widgets/_index.scss @@ -0,0 +1,7 @@ +@import '_cookieconsent'; +@import '_fixed-button'; +@import '_github-corner'; +@import '_noscript-warning'; +@import '_post-chat'; +@import '_reading-progress'; +@import '_typeit'; diff --git a/assets/css/_partials/_mask.scss b/assets/css/_widgets/_mask.scss similarity index 100% rename from assets/css/_partials/_mask.scss rename to assets/css/_widgets/_mask.scss diff --git a/assets/css/_partials/_widgets/_noscript-warning.scss b/assets/css/_widgets/_noscript-warning.scss similarity index 100% rename from assets/css/_partials/_widgets/_noscript-warning.scss rename to assets/css/_widgets/_noscript-warning.scss diff --git a/assets/css/_partials/_widgets/_post-chat.scss b/assets/css/_widgets/_post-chat.scss similarity index 100% rename from assets/css/_partials/_widgets/_post-chat.scss rename to assets/css/_widgets/_post-chat.scss diff --git a/assets/css/_partials/_widgets/_reading-progress.scss b/assets/css/_widgets/_reading-progress.scss similarity index 100% rename from assets/css/_partials/_widgets/_reading-progress.scss rename to assets/css/_widgets/_reading-progress.scss diff --git a/assets/css/_partials/_scrollbar.scss b/assets/css/_widgets/_scrollbar.scss similarity index 100% rename from assets/css/_partials/_scrollbar.scss rename to assets/css/_widgets/_scrollbar.scss diff --git a/assets/css/_partials/_widgets/_typeit.scss b/assets/css/_widgets/_typeit.scss similarity index 100% rename from assets/css/_partials/_widgets/_typeit.scss rename to assets/css/_widgets/_typeit.scss diff --git a/layouts/_partials/init/index.html b/layouts/_partials/init/index.html index 07a98e5e..45946306 100644 --- a/layouts/_partials/init/index.html +++ b/layouts/_partials/init/index.html @@ -1,4 +1,4 @@ -{{- hugo.Store.Set "version" "v0.4.2" -}} +{{- hugo.Store.Set "version" "v0.4.3-20260123080729-2a5bd268" -}} {{- .Store.Set "this" dict -}} {{- partial "init/detection-env.html" . -}}