From 8265db32bc586fcf59a1c8aeeed78491a25f0194 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Fri, 9 Sep 2022 16:04:47 +0800 Subject: [PATCH] :recycle: Refactor: scss directory (#185) --- CHANGELOG.md | 1 + assets/css/_core/_base.scss | 8 ++++---- assets/css/{ => _core}/_common.scss | 0 assets/css/{ => _core}/_root.scss | 0 assets/css/_maps/_index.scss | 4 ---- assets/css/_page/_archive.scss | 4 ++-- assets/css/_page/_single.scss | 10 +++++----- assets/css/_partial/_widgets/_index.scss | 4 ---- .../_archive/_tags.scss | 0 .../_archive/_terms.scss | 0 .../css/{_partial => _partials}/_details.scss | 0 .../css/{_partial => _partials}/_footer.scss | 0 .../css/{_partial => _partials}/_header.scss | 0 assets/css/{_partial => _partials}/_icon.scss | 0 .../{ => _partials}/_maps/_admonition.scss | 0 .../_maps/_code-highlight.scss | 0 .../css/{ => _partials}/_maps/_code-type.scss | 0 assets/css/{ => _partials}/_maps/_colors.scss | 0 assets/css/{_partial => _partials}/_mask.scss | 0 .../{_partial => _partials}/_pagination.scss | 0 .../_single/_code.scss | 0 .../_single/_comment.scss | 0 .../_single/_fixit-decryptor.scss | 0 .../_single/_footer.scss | 0 .../_single/_github-dark-dimmed.scss | 0 .../{_partial => _partials}/_single/_toc.scss | 0 assets/css/_partials/_widgets.scss | 4 ++++ .../_widgets/_cookieconsent.scss | 0 .../_widgets/_fixed-button.scss | 0 .../_widgets/_github-corner.scss | 0 .../_widgets/_typeit.scss | 0 assets/css/_variables.scss | 5 ++++- assets/css/style.scss | 19 ++++++------------- 33 files changed, 26 insertions(+), 33 deletions(-) rename assets/css/{ => _core}/_common.scss (100%) rename assets/css/{ => _core}/_root.scss (100%) delete mode 100644 assets/css/_maps/_index.scss delete mode 100644 assets/css/_partial/_widgets/_index.scss rename assets/css/{_partial => _partials}/_archive/_tags.scss (100%) rename assets/css/{_partial => _partials}/_archive/_terms.scss (100%) rename assets/css/{_partial => _partials}/_details.scss (100%) rename assets/css/{_partial => _partials}/_footer.scss (100%) rename assets/css/{_partial => _partials}/_header.scss (100%) rename assets/css/{_partial => _partials}/_icon.scss (100%) rename assets/css/{ => _partials}/_maps/_admonition.scss (100%) rename assets/css/{ => _partials}/_maps/_code-highlight.scss (100%) rename assets/css/{ => _partials}/_maps/_code-type.scss (100%) rename assets/css/{ => _partials}/_maps/_colors.scss (100%) rename assets/css/{_partial => _partials}/_mask.scss (100%) rename assets/css/{_partial => _partials}/_pagination.scss (100%) rename assets/css/{_partial => _partials}/_single/_code.scss (100%) rename assets/css/{_partial => _partials}/_single/_comment.scss (100%) rename assets/css/{_partial => _partials}/_single/_fixit-decryptor.scss (100%) rename assets/css/{_partial => _partials}/_single/_footer.scss (100%) rename assets/css/{_partial => _partials}/_single/_github-dark-dimmed.scss (100%) rename assets/css/{_partial => _partials}/_single/_toc.scss (100%) create mode 100644 assets/css/_partials/_widgets.scss rename assets/css/{_partial => _partials}/_widgets/_cookieconsent.scss (100%) rename assets/css/{_partial => _partials}/_widgets/_fixed-button.scss (100%) rename assets/css/{_partial => _partials}/_widgets/_github-corner.scss (100%) rename assets/css/{_partial => _partials}/_widgets/_typeit.scss (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cbedcf5..35239fa7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file. - :recycle: Refactor: image rendering - :recycle: Refactor: back to top and scroll to comments - :recycle: Refactor: custom.js rendering and remove `params.customJS` ([#189](https://github.com/hugo-fixit/FixIt/pull/189)) +- :recycle: Refactor: scss directory ([#185](https://github.com/hugo-fixit/FixIt/issues/185)) - :bug: Fix: add function `dos2unix` to unify new lines symbol between Windows and Unix/Mac OS - :bug: Fix: author display error in post and markdown file - :bug: Fix: use data attributes or class replace for custom attributes diff --git a/assets/css/_core/_base.scss b/assets/css/_core/_base.scss index 921f93f4..466b772f 100644 --- a/assets/css/_core/_base.scss +++ b/assets/css/_core/_base.scss @@ -62,7 +62,7 @@ iframe { @include ms; @include link(true, true); -@import '../_partial/mask'; -@import '../_partial/icon'; -@import '../_partial/details'; -@import '../_partial/_widgets'; +@import '../_partials/mask'; +@import '../_partials/icon'; +@import '../_partials/details'; +@import '../_partials/widgets'; diff --git a/assets/css/_common.scss b/assets/css/_core/_common.scss similarity index 100% rename from assets/css/_common.scss rename to assets/css/_core/_common.scss diff --git a/assets/css/_root.scss b/assets/css/_core/_root.scss similarity index 100% rename from assets/css/_root.scss rename to assets/css/_core/_root.scss diff --git a/assets/css/_maps/_index.scss b/assets/css/_maps/_index.scss deleted file mode 100644 index 27fb1a9e..00000000 --- a/assets/css/_maps/_index.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '_colors'; -@import '_code-type'; -@import '_code-highlight'; -@import '_admonition'; diff --git a/assets/css/_page/_archive.scss b/assets/css/_page/_archive.scss index 6de36382..43193a80 100644 --- a/assets/css/_page/_archive.scss +++ b/assets/css/_page/_archive.scss @@ -22,6 +22,6 @@ margin-bottom: 1rem; } - @import '../_partial/_archive/terms'; - @import '../_partial/_archive/tags'; + @import '../_partials/_archive/terms'; + @import '../_partials/_archive/tags'; } diff --git a/assets/css/_page/_single.scss b/assets/css/_page/_single.scss index 53ca1c34..8c3b53eb 100644 --- a/assets/css/_page/_single.scss +++ b/assets/css/_page/_single.scss @@ -1,5 +1,5 @@ -@import '../_partial/_single/toc'; -@import '../_partial/_single/fixit-decryptor'; +@import '../_partials/_single/toc'; +@import '../_partials/_single/fixit-decryptor'; .single { .single-title { @@ -333,7 +333,7 @@ } } - @import '../_partial/_single/code'; + @import '../_partials/_single/code'; @import '../_shortcodes/index'; hr { @@ -374,8 +374,8 @@ } } - @import '../_partial/_single/footer'; - @import '../_partial/_single/comment'; + @import '../_partials/_single/footer'; + @import '../_partials/_single/comment'; } .lg-toolbar .lg-icon::after { diff --git a/assets/css/_partial/_widgets/_index.scss b/assets/css/_partial/_widgets/_index.scss deleted file mode 100644 index bffe374b..00000000 --- a/assets/css/_partial/_widgets/_index.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '_cookieconsent'; -@import '_fixed-button'; -@import '_github-corner'; -@import '_typeit'; \ No newline at end of file diff --git a/assets/css/_partial/_archive/_tags.scss b/assets/css/_partials/_archive/_tags.scss similarity index 100% rename from assets/css/_partial/_archive/_tags.scss rename to assets/css/_partials/_archive/_tags.scss diff --git a/assets/css/_partial/_archive/_terms.scss b/assets/css/_partials/_archive/_terms.scss similarity index 100% rename from assets/css/_partial/_archive/_terms.scss rename to assets/css/_partials/_archive/_terms.scss diff --git a/assets/css/_partial/_details.scss b/assets/css/_partials/_details.scss similarity index 100% rename from assets/css/_partial/_details.scss rename to assets/css/_partials/_details.scss diff --git a/assets/css/_partial/_footer.scss b/assets/css/_partials/_footer.scss similarity index 100% rename from assets/css/_partial/_footer.scss rename to assets/css/_partials/_footer.scss diff --git a/assets/css/_partial/_header.scss b/assets/css/_partials/_header.scss similarity index 100% rename from assets/css/_partial/_header.scss rename to assets/css/_partials/_header.scss diff --git a/assets/css/_partial/_icon.scss b/assets/css/_partials/_icon.scss similarity index 100% rename from assets/css/_partial/_icon.scss rename to assets/css/_partials/_icon.scss diff --git a/assets/css/_maps/_admonition.scss b/assets/css/_partials/_maps/_admonition.scss similarity index 100% rename from assets/css/_maps/_admonition.scss rename to assets/css/_partials/_maps/_admonition.scss diff --git a/assets/css/_maps/_code-highlight.scss b/assets/css/_partials/_maps/_code-highlight.scss similarity index 100% rename from assets/css/_maps/_code-highlight.scss rename to assets/css/_partials/_maps/_code-highlight.scss diff --git a/assets/css/_maps/_code-type.scss b/assets/css/_partials/_maps/_code-type.scss similarity index 100% rename from assets/css/_maps/_code-type.scss rename to assets/css/_partials/_maps/_code-type.scss diff --git a/assets/css/_maps/_colors.scss b/assets/css/_partials/_maps/_colors.scss similarity index 100% rename from assets/css/_maps/_colors.scss rename to assets/css/_partials/_maps/_colors.scss diff --git a/assets/css/_partial/_mask.scss b/assets/css/_partials/_mask.scss similarity index 100% rename from assets/css/_partial/_mask.scss rename to assets/css/_partials/_mask.scss diff --git a/assets/css/_partial/_pagination.scss b/assets/css/_partials/_pagination.scss similarity index 100% rename from assets/css/_partial/_pagination.scss rename to assets/css/_partials/_pagination.scss diff --git a/assets/css/_partial/_single/_code.scss b/assets/css/_partials/_single/_code.scss similarity index 100% rename from assets/css/_partial/_single/_code.scss rename to assets/css/_partials/_single/_code.scss diff --git a/assets/css/_partial/_single/_comment.scss b/assets/css/_partials/_single/_comment.scss similarity index 100% rename from assets/css/_partial/_single/_comment.scss rename to assets/css/_partials/_single/_comment.scss diff --git a/assets/css/_partial/_single/_fixit-decryptor.scss b/assets/css/_partials/_single/_fixit-decryptor.scss similarity index 100% rename from assets/css/_partial/_single/_fixit-decryptor.scss rename to assets/css/_partials/_single/_fixit-decryptor.scss diff --git a/assets/css/_partial/_single/_footer.scss b/assets/css/_partials/_single/_footer.scss similarity index 100% rename from assets/css/_partial/_single/_footer.scss rename to assets/css/_partials/_single/_footer.scss diff --git a/assets/css/_partial/_single/_github-dark-dimmed.scss b/assets/css/_partials/_single/_github-dark-dimmed.scss similarity index 100% rename from assets/css/_partial/_single/_github-dark-dimmed.scss rename to assets/css/_partials/_single/_github-dark-dimmed.scss diff --git a/assets/css/_partial/_single/_toc.scss b/assets/css/_partials/_single/_toc.scss similarity index 100% rename from assets/css/_partial/_single/_toc.scss rename to assets/css/_partials/_single/_toc.scss diff --git a/assets/css/_partials/_widgets.scss b/assets/css/_partials/_widgets.scss new file mode 100644 index 00000000..9c743bf8 --- /dev/null +++ b/assets/css/_partials/_widgets.scss @@ -0,0 +1,4 @@ +@import '_widgets/cookieconsent'; +@import '_widgets/fixed-button'; +@import '_widgets/github-corner'; +@import '_widgets/typeit'; \ No newline at end of file diff --git a/assets/css/_partial/_widgets/_cookieconsent.scss b/assets/css/_partials/_widgets/_cookieconsent.scss similarity index 100% rename from assets/css/_partial/_widgets/_cookieconsent.scss rename to assets/css/_partials/_widgets/_cookieconsent.scss diff --git a/assets/css/_partial/_widgets/_fixed-button.scss b/assets/css/_partials/_widgets/_fixed-button.scss similarity index 100% rename from assets/css/_partial/_widgets/_fixed-button.scss rename to assets/css/_partials/_widgets/_fixed-button.scss diff --git a/assets/css/_partial/_widgets/_github-corner.scss b/assets/css/_partials/_widgets/_github-corner.scss similarity index 100% rename from assets/css/_partial/_widgets/_github-corner.scss rename to assets/css/_partials/_widgets/_github-corner.scss diff --git a/assets/css/_partial/_widgets/_typeit.scss b/assets/css/_partials/_widgets/_typeit.scss similarity index 100% rename from assets/css/_partial/_widgets/_typeit.scss rename to assets/css/_partials/_widgets/_typeit.scss diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss index fd1884e5..fb783810 100644 --- a/assets/css/_variables.scss +++ b/assets/css/_variables.scss @@ -146,4 +146,7 @@ $github-corner-fill: $header-background-color-dark !default; $github-corner-fill-dark: $header-background-color !default; // ========== GitHub Corners ========== // -@import '_maps/index'; +@import '_partials/_maps/admonition'; +@import '_partials/_maps/code-highlight'; +@import '_partials/_maps/code-type'; +@import '_partials/_maps/colors'; diff --git a/assets/css/style.scss b/assets/css/style.scss index 071f789b..1aa13aac 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -2,22 +2,15 @@ @import "_variables"; @import "_override"; - @import "_mixin/index"; - @import "../lib/normalize/normalize"; - -@import "_root"; +@import "_core/root"; +@import "_core/common"; @import "_core/base"; @import "_core/layout"; - -@import "_page/index"; - -@import "_partial/header"; -@import "_partial/footer"; -@import "_partial/pagination"; - +@import "_page"; +@import "_partials/header"; +@import "_partials/footer"; +@import "_partials/pagination"; @import "_core/media"; - -@import "_common"; @import "_custom";