From 02085ffbe054a8da57961fa432de16c650c22c4f Mon Sep 17 00:00:00 2001 From: Somrat <58769763+tfsomrat@users.noreply.github.com> Date: Sun, 16 Feb 2025 12:07:19 +0600 Subject: [PATCH] update tailwind v4, remove sass and postcss dependency --- assets/{scss/base.scss => css/base.css} | 2 +- assets/{scss/buttons.scss => css/buttons.css} | 0 assets/css/components.css | 54 +++++++++ assets/css/custom.css | 2 + assets/css/main.css | 37 ++++++ assets/css/module-overrides.css | 54 +++++++++ .../navigation.scss => css/navigation.css} | 37 ++---- assets/css/safe.css | 8 ++ assets/css/utilities.css | 29 +++++ assets/js/main.js | 2 +- assets/scss/components.scss | 74 ------------ assets/scss/custom.scss | 2 - assets/scss/main.scss | 30 ----- assets/scss/module-overrides.scss | 58 ---------- assets/scss/utilities.scss | 20 ---- exampleSite/assets/css/custom.css | 1 + exampleSite/assets/scss/custom.scss | 1 - exampleSite/data/theme.json | 4 +- exampleSite/go.mod | 48 ++++---- exampleSite/hugo.toml | 39 ++----- exampleSite/tailwind.config.js | 103 ----------------- layouts/partials/essentials/header.html | 11 +- layouts/partials/essentials/style.html | 24 ++-- package.json | 19 +-- readme.md | 4 +- scripts/removeDarkmode.js | 14 +-- scripts/themeSetup.js | 2 - tailwind-plugin/tw-bs-grid.js | 109 ++++++++++++++++++ tailwind-plugin/tw-theme.js | 96 +++++++++++++++ 29 files changed, 468 insertions(+), 416 deletions(-) rename assets/{scss/base.scss => css/base.css} (95%) rename assets/{scss/buttons.scss => css/buttons.css} (100%) create mode 100755 assets/css/components.css create mode 100644 assets/css/custom.css create mode 100755 assets/css/main.css create mode 100644 assets/css/module-overrides.css rename assets/{scss/navigation.scss => css/navigation.css} (78%) create mode 100644 assets/css/safe.css create mode 100755 assets/css/utilities.css delete mode 100755 assets/scss/components.scss delete mode 100644 assets/scss/custom.scss delete mode 100755 assets/scss/main.scss delete mode 100644 assets/scss/module-overrides.scss delete mode 100755 assets/scss/utilities.scss create mode 100755 exampleSite/assets/css/custom.css delete mode 100755 exampleSite/assets/scss/custom.scss delete mode 100755 exampleSite/tailwind.config.js create mode 100644 tailwind-plugin/tw-bs-grid.js create mode 100644 tailwind-plugin/tw-theme.js diff --git a/assets/scss/base.scss b/assets/css/base.css similarity index 95% rename from assets/scss/base.scss rename to assets/css/base.css index 2fac7c2..3d96dca 100755 --- a/assets/scss/base.scss +++ b/assets/css/base.css @@ -55,5 +55,5 @@ code { } blockquote > p { - @apply my-0 #{!important}; + @apply my-0!; } diff --git a/assets/scss/buttons.scss b/assets/css/buttons.css similarity index 100% rename from assets/scss/buttons.scss rename to assets/css/buttons.css diff --git a/assets/css/components.css b/assets/css/components.css new file mode 100755 index 0000000..baf190e --- /dev/null +++ b/assets/css/components.css @@ -0,0 +1,54 @@ +/* section style */ +.section { + @apply py-24 xl:py-28; +} + +.section-sm { + @apply py-16 xl:py-20; +} + +/* container */ +.container { + @apply mx-auto max-w-[1320px] px-4; +} + +/* social icons */ +.social-icons { + @apply space-x-4; +} +.social-icons li { + @apply inline-block; +} +.social-icons li a { + @apply flex h-9 w-9 items-center justify-center rounded-sm bg-primary text-center leading-9 text-white dark:bg-darkmode-primary dark:text-dark; +} +.social-icons li a svg { + @apply h-5 w-5; +} + +/* content style */ +.content { + @apply prose max-w-none; + @apply prose-headings:mb-[.3em] prose-headings:mt-[.6em] prose-headings:text-dark dark:prose-headings:text-darkmode-dark; + @apply prose-h1:text-h1-sm md:prose-h1:text-h1; + @apply prose-h2:text-h2-sm md:prose-h2:text-h2; + @apply prose-h3:text-h3-sm md:prose-h3:text-h3; + @apply prose-img:max-w-full prose-img:rounded; + @apply prose-hr:border-border dark:prose-hr:border-darkmode-border; + @apply prose-p:text-base prose-p:text-text dark:prose-p:text-darkmode-text; + @apply prose-blockquote:rounded-lg prose-blockquote:border prose-blockquote:border-l-[10px] prose-blockquote:border-primary prose-blockquote:bg-theme-light prose-blockquote:px-8 prose-blockquote:py-10 prose-blockquote:font-secondary prose-blockquote:text-2xl prose-blockquote:not-italic prose-blockquote:text-dark dark:prose-blockquote:border-darkmode-primary dark:prose-blockquote:bg-darkmode-theme-light dark:prose-blockquote:text-darkmode-light; + @apply prose-pre:rounded-lg prose-pre:bg-theme-light dark:prose-pre:bg-darkmode-theme-light; + @apply prose-code:px-1 prose-code:text-primary dark:prose-code:text-darkmode-primary; + @apply prose-strong:text-dark dark:prose-strong:text-darkmode-text; + @apply prose-a:text-text prose-a:underline prose-a:hover:text-primary dark:prose-a:text-darkmode-text dark:prose-a:hover:text-darkmode-primary; + @apply prose-li:text-text dark:prose-li:text-darkmode-text; + @apply prose-table:relative prose-table:overflow-hidden prose-table:rounded-lg prose-table:before:absolute prose-table:before:left-0 prose-table:before:top-0 prose-table:before:h-full prose-table:before:w-full prose-table:before:rounded-[inherit] prose-table:before:border prose-table:before:content-[""] dark:prose-table:before:border-darkmode-border; + @apply prose-thead:border-border prose-thead:bg-theme-light dark:prose-thead:border-darkmode-border dark:prose-thead:bg-darkmode-theme-light; + @apply prose-th:relative prose-th:z-10 prose-th:px-4 prose-th:py-[18px] prose-th:text-dark dark:prose-th:text-darkmode-text; + @apply prose-tr:border-border dark:prose-tr:border-darkmode-border; + @apply prose-td:relative prose-td:z-10 prose-td:px-3 prose-td:py-[18px] dark:prose-td:text-darkmode-text; +} + +.content .btn { + @apply dark:hover:text-dark no-underline hover:!text-white; +} diff --git a/assets/css/custom.css b/assets/css/custom.css new file mode 100644 index 0000000..512016d --- /dev/null +++ b/assets/css/custom.css @@ -0,0 +1,2 @@ +/* DO NOT WRITE ANY STYLE IN THIS FILE */ +/* If you want to add your own styles, please write it in the `./assets/css/custom.css` file. */ diff --git a/assets/css/main.css b/assets/css/main.css new file mode 100755 index 0000000..c98c3ed --- /dev/null +++ b/assets/css/main.css @@ -0,0 +1,37 @@ +@import "tailwindcss"; +@plugin "@tailwindcss/forms"; +@plugin "@tailwindcss/typography"; +@plugin "./tailwind-plugin/tw-theme"; +@plugin "./tailwind-plugin/tw-bs-grid"; +@source "hugo_stats.json"; + +@custom-variant dark (&:where(.dark, .dark *)); + +@import "./safe.css"; + +@layer base { + @import "./base.css"; +} + +@layer components { + @import "./components.css"; + @import "./navigation.css"; + @import "./buttons.css"; +} + +@layer utilities { + @import "./utilities.css"; +} + +@import "search.css"; +@import "social-share.css"; +@import "gallery-slider.css"; +@import "images.css"; +@import "toc.css"; +@import "tab.css"; +@import "accordion.css"; +@import "modal.css"; +@import "notice.css"; + +@import "module-overrides.css"; +@import "custom.css"; diff --git a/assets/css/module-overrides.css b/assets/css/module-overrides.css new file mode 100644 index 0000000..45369e4 --- /dev/null +++ b/assets/css/module-overrides.css @@ -0,0 +1,54 @@ +/* table of contents */ +.table-of-content { + @apply overflow-hidden rounded; +} + +/* share icons */ +.share-icons .share-link { + @apply h-9 w-9 rounded leading-9 bg-primary hover:bg-primary dark:bg-darkmode-primary dark:hover:bg-darkmode-primary; +} + +.share-icons .share-icon svg { + @apply dark:fill-dark; +} + +/* notice */ +.notice { + @apply rounded-lg; +} + +/* tab */ +.tab { + @apply border-border dark:border-darkmode-border overflow-hidden rounded-lg border; +} +.tab-nav { + @apply border-border bg-theme-light dark:border-darkmode-border dark:bg-darkmode-theme-light pl-4; +} +.tab-nav-item { + @apply text-dark dark:text-darkmode-dark px-8 !text-lg; +} +.tab-nav-item.active { + @apply border-dark dark:border-darkmode-primary; +} + +.tab-content-panel { + @apply px-4 !pt-0; +} + +/* accordion */ +.accordion { + @apply border-border bg-theme-light dark:border-darkmode-border dark:bg-darkmode-theme-light mb-6 overflow-hidden rounded-lg border; +} +.accordion-header { + @apply text-dark dark:text-darkmode-dark; +} + +/* cookie consent */ +.cookie-box { + @apply !rounded-lg; +} + +/* slider */ +.gallery-slider { + @apply !ml-0; +} diff --git a/assets/scss/navigation.scss b/assets/css/navigation.css similarity index 78% rename from assets/scss/navigation.scss rename to assets/css/navigation.css index 24fc9e1..1ffbf28 100755 --- a/assets/scss/navigation.scss +++ b/assets/css/navigation.css @@ -1,21 +1,8 @@ -// navbar toggler -input#nav-toggle:checked + label #show-button { - @apply hidden; -} - -input#nav-toggle:checked + label #hide-button { - @apply block; -} - -input#nav-toggle:checked ~ #nav-menu { - @apply block; -} - .header { @apply bg-body dark:bg-darkmode-body py-6; } -// navbar items +/* navbar items */ .navbar { @apply relative flex flex-wrap items-center justify-between; } @@ -31,24 +18,20 @@ input#nav-toggle:checked ~ #nav-menu { @apply text-center lg:text-left; } -// .nav-item { -// @apply mx-3; -// } - .nav-link { @apply text-dark hover:text-primary dark:text-darkmode-dark dark:hover:text-darkmode-primary block p-3 cursor-pointer font-semibold transition lg:px-2 lg:py-3; } .nav-dropdown { @apply mr-0; - & > svg { - @apply pointer-events-none; - } - &.active { - .nav-dropdown-list { - @apply block; - } - } +} + +.nav-dropdown > svg { + @apply pointer-events-none; +} + +.nav-dropdown.active .nav-dropdown-list { + @apply block; } .nav-dropdown-list { @@ -63,7 +46,7 @@ input#nav-toggle:checked ~ #nav-menu { @apply text-dark hover:text-primary dark:text-darkmode-text dark:hover:text-darkmode-primary block py-1 font-semibold transition; } -//theme-switcher +/* theme-switcher */ .theme-switcher { @apply inline-flex; diff --git a/assets/css/safe.css b/assets/css/safe.css new file mode 100644 index 0000000..ec69497 --- /dev/null +++ b/assets/css/safe.css @@ -0,0 +1,8 @@ +/* swiper pagination */ +.swiper-pagination-bullet { + @apply !h-2.5 !w-2.5 !bg-theme-light !opacity-100 dark:!bg-darkmode-theme-light; +} + +.swiper-pagination-bullet-active { + @apply !h-4 !w-4 !bg-primary dark:!bg-darkmode-primary; +} diff --git a/assets/css/utilities.css b/assets/css/utilities.css new file mode 100755 index 0000000..f8db083 --- /dev/null +++ b/assets/css/utilities.css @@ -0,0 +1,29 @@ +/* navbar toggler */ +input#nav-toggle:checked + label #show-button { + @apply hidden; +} + +input#nav-toggle:checked + label #hide-button { + @apply block; +} + +input#nav-toggle:checked ~ #nav-menu { + @apply block; +} + +.bg-gradient { + @apply bg-linear-to-b from-[rgba(249,249,249,1)] from-[0.53%] to-white to-[83.28%] dark:from-darkmode-theme-light dark:to-darkmode-body; +} + +.shadow { + @apply shadow-[0px_4px_40px_rgba(0,0,0,0.05)]; +} + +/* form style */ +.form-input { + @apply w-full rounded border-transparent bg-theme-light px-6 py-4 text-dark placeholder:text-light focus:border-primary dark:focus:border-darkmode-primary focus:ring-transparent dark:border-darkmode-border dark:bg-darkmode-theme-light dark:text-darkmode-light; +} + +.form-label { + @apply mb-4 block font-secondary text-xl font-normal text-dark dark:text-darkmode-light; +} diff --git a/assets/js/main.js b/assets/js/main.js index 3b3e302..59272a5 100755 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -10,7 +10,7 @@ dropdownMenuToggler.forEach((toggler) => { toggler?.addEventListener("click", (e) => { - e.target.closest('.nav-item').classList.toggle("active"); + e.target.closest(".nav-item").classList.toggle("active"); }); }); diff --git a/assets/scss/components.scss b/assets/scss/components.scss deleted file mode 100755 index 213d5a1..0000000 --- a/assets/scss/components.scss +++ /dev/null @@ -1,74 +0,0 @@ -main { - min-height: 70vh; -} - -// section style -.section { - @apply py-24 xl:py-28; - &-sm { - @apply py-16 xl:py-20; - } -} - -// container -.container { - @apply mx-auto px-4 2xl:max-w-[1320px]; -} - -// form style -.form-input { - @apply bg-theme-light text-dark placeholder:text-light focus:border-primary dark:border-darkmode-border dark:bg-darkmode-theme-light dark:text-darkmode-light w-full rounded border-transparent px-6 py-4 focus:ring-transparent; -} - -.form-label { - @apply font-secondary text-dark dark:text-darkmode-light mb-4 block text-xl font-normal; -} - -// social icons -.social-icons { - @apply space-x-4; - li { - @apply inline-block; - a { - @apply bg-primary dark:bg-darkmode-primary dark:text-dark flex h-9 w-9 items-center justify-center rounded text-center leading-9 text-white; - svg { - @apply h-5 w-5; - } - } - } -} - -// swiper pagination -.swiper-pagination-bullet { - @apply bg-theme-light dark:bg-darkmode-theme-light h-2.5 w-2.5 opacity-100 mx-1.5 #{!important}; - - &-active { - @apply bg-primary dark:bg-darkmode-primary h-4 w-4 #{!important}; - } -} - -// content style -.content { - @apply prose max-w-none; - @apply prose-headings:mb-[.3em] prose-headings:mt-[.6em] prose-headings:text-dark prose-headings:dark:text-darkmode-dark; - @apply prose-h1:text-h1-sm md:prose-h1:text-h1; - @apply prose-h2:text-h2-sm md:prose-h2:text-h2; - @apply prose-h3:text-h3-sm md:prose-h3:text-h3; - @apply prose-img:max-w-full prose-img:rounded; - @apply prose-hr:border-border prose-hr:dark:border-darkmode-border; - @apply prose-p:text-base prose-p:text-text prose-p:dark:text-darkmode-text; - @apply prose-blockquote:rounded-lg prose-blockquote:border prose-blockquote:border-l-[10px] prose-blockquote:border-primary prose-blockquote:bg-theme-light prose-blockquote:px-8 prose-blockquote:py-10 prose-blockquote:font-secondary prose-blockquote:text-2xl prose-blockquote:not-italic prose-blockquote:text-dark prose-blockquote:dark:border-darkmode-primary prose-blockquote:dark:bg-darkmode-theme-light prose-blockquote:dark:text-darkmode-light; - @apply prose-pre:rounded-lg prose-pre:bg-theme-light prose-pre:dark:bg-darkmode-theme-light; - @apply prose-code:px-1 prose-code:dark:text-darkmode-light; - @apply prose-strong:text-dark prose-strong:dark:text-darkmode-text; - @apply prose-a:text-text prose-a:underline hover:prose-a:text-primary prose-a:dark:text-darkmode-text hover:prose-a:dark:text-darkmode-primary; - @apply prose-li:text-text prose-li:dark:text-darkmode-text; - @apply prose-table:relative prose-table:overflow-hidden prose-table:rounded-lg prose-table:before:absolute prose-table:before:left-0 prose-table:before:top-0 prose-table:before:h-full prose-table:before:w-full prose-table:before:rounded-[inherit] prose-table:before:border prose-table:before:content-[""] prose-table:before:dark:border-darkmode-border; - @apply prose-thead:border-border prose-thead:bg-theme-light prose-thead:dark:border-darkmode-border prose-thead:dark:bg-darkmode-theme-light; - @apply prose-th:relative prose-th:z-10 prose-th:px-4 prose-th:py-[18px] prose-th:text-dark prose-th:dark:text-darkmode-text; - @apply prose-tr:border-border prose-tr:dark:border-darkmode-border; - @apply prose-td:relative prose-td:z-10 prose-td:px-3 prose-td:py-[18px] prose-td:dark:text-darkmode-text; - .btn { - @apply dark:hover:text-dark no-underline hover:text-white #{!important}; - } -} diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss deleted file mode 100644 index 6dc68fe..0000000 --- a/assets/scss/custom.scss +++ /dev/null @@ -1,2 +0,0 @@ -// DO NOT WRITE ANY STYLE IN THIS FILE -// If you want to add your own styles, please write it in the `./assets/scss/custom.scss` file. diff --git a/assets/scss/main.scss b/assets/scss/main.scss deleted file mode 100755 index 4bbaf78..0000000 --- a/assets/scss/main.scss +++ /dev/null @@ -1,30 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - -@layer base { - @import "base"; -} - -@layer components { - @import "components"; - @import "navigation"; - @import "buttons"; -} - -@layer utilities { - @import "utilities"; -} - -@import "search"; -@import "social-share"; -@import "gallery-slider"; -@import "images"; -@import "toc"; -@import "tab"; -@import "accordion"; -@import "modal"; -@import "notice"; - -@import "module-overrides"; -@import "custom"; diff --git a/assets/scss/module-overrides.scss b/assets/scss/module-overrides.scss deleted file mode 100644 index d1a0f25..0000000 --- a/assets/scss/module-overrides.scss +++ /dev/null @@ -1,58 +0,0 @@ -// table of contents -.table-of-content { - @apply overflow-hidden rounded; -} - -// share icons -.share-icons { - .share-link { - @apply h-9 w-9 rounded leading-9; - @apply bg-primary hover:bg-primary dark:bg-darkmode-primary dark:hover:bg-darkmode-primary; - } - .share-icon svg { - @apply dark:fill-dark; - } -} - -// notice -.notice { - @apply rounded-lg; -} - -// tab -.tab { - @apply border-border dark:border-darkmode-border overflow-hidden rounded-lg border; - &-nav { - @apply border-border bg-theme-light dark:border-darkmode-border dark:bg-darkmode-theme-light pl-4; - - &-item { - @apply text-dark dark:text-darkmode-dark px-8 text-lg #{!important}; - &.active { - @apply border-dark dark:border-darkmode-primary; - } - } - } - &-content { - &-panel { - @apply px-4 pt-0 #{!important}; - } - } -} - -// accordion -.accordion { - @apply border-border bg-theme-light dark:border-darkmode-border dark:bg-darkmode-theme-light mb-6 overflow-hidden rounded-lg border; - &-header { - @apply text-dark dark:text-darkmode-dark; - } -} - -// cookie consent -.cookie-box { - @apply rounded-lg #{!important}; -} - -// slider -.gallery-slider { - @apply ml-0 #{!important}; -} diff --git a/assets/scss/utilities.scss b/assets/scss/utilities.scss deleted file mode 100755 index 154570e..0000000 --- a/assets/scss/utilities.scss +++ /dev/null @@ -1,20 +0,0 @@ -.bg-gradient { - @apply dark:from-darkmode-theme-light dark:to-darkmode-body bg-gradient-to-b from-[rgba(249,249,249,1)] from-[0.53%] to-white to-[83.28%]; -} - -.rounded-sm { - @apply rounded-[4px]; -} -.rounded { - @apply rounded-[6px]; -} -.rounded-lg { - @apply rounded-[12px]; -} -.rounded-xl { - @apply rounded-[16px]; -} - -.shadow { - box-shadow: 0px 4px 40px rgba(0, 0, 0, 0.05); -} diff --git a/exampleSite/assets/css/custom.css b/exampleSite/assets/css/custom.css new file mode 100755 index 0000000..6c77cfa --- /dev/null +++ b/exampleSite/assets/css/custom.css @@ -0,0 +1 @@ +/* Add your own custom styles here */ diff --git a/exampleSite/assets/scss/custom.scss b/exampleSite/assets/scss/custom.scss deleted file mode 100755 index 9685904..0000000 --- a/exampleSite/assets/scss/custom.scss +++ /dev/null @@ -1 +0,0 @@ -// Add your own custom styles here diff --git a/exampleSite/data/theme.json b/exampleSite/data/theme.json index a17716f..6417eb8 100644 --- a/exampleSite/data/theme.json +++ b/exampleSite/data/theme.json @@ -9,7 +9,7 @@ "theme_dark": "" }, "text_color": { - "default": "#444444", + "text": "#444444", "dark": "#040404", "light": "#717171" } @@ -23,7 +23,7 @@ "theme_dark": "" }, "text_color": { - "default": "#B4AFB6", + "text": "#B4AFB6", "dark": "#fff", "light": "#B4AFB6" } diff --git a/exampleSite/go.mod b/exampleSite/go.mod index a04d906..b4fb030 100644 --- a/exampleSite/go.mod +++ b/exampleSite/go.mod @@ -3,29 +3,29 @@ module hugoplate.netlify.app go 1.21 require ( - github.com/gethugothemes/hugo-modules/accordion v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/adsense v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/components/announcement v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/components/cookie-consent v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/components/custom-script v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/components/preloader v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/components/render-link v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/components/social-share v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/gallery-slider v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/gzip-caching v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/icons/font-awesome v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/images v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/modal v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/pwa v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/search v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/seo-tools/basic-seo v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/seo-tools/google-tag-manager v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/seo-tools/site-verifications v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/shortcodes/button v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/shortcodes/notice v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/tab v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/table-of-contents v0.0.0-20250112030311-a0de82520a5a // indirect - github.com/gethugothemes/hugo-modules/videos v0.0.0-20250112030311-a0de82520a5a // indirect + github.com/gethugothemes/hugo-modules/accordion v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/adsense v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/components/announcement v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/components/cookie-consent v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/components/custom-script v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/components/preloader v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/components/render-link v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/components/social-share v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/gallery-slider v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/gzip-caching v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/icons/font-awesome v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/images v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/modal v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/pwa v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/search v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/seo-tools/basic-seo v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/seo-tools/google-tag-manager v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/seo-tools/site-verifications v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/shortcodes/button v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/shortcodes/notice v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/tab v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/table-of-contents v0.0.0-20250213104422-d6c69545f20a // indirect + github.com/gethugothemes/hugo-modules/videos v0.0.0-20250213104422-d6c69545f20a // indirect github.com/hugomods/mermaid v0.1.4 // indirect - github.com/zeon-studio/hugoplate v0.0.0-20250116040859-e767a2ce9068 // indirect + github.com/zeon-studio/hugoplate v0.0.0-20250205092428-3b220f635d99 // indirect ) diff --git a/exampleSite/hugo.toml b/exampleSite/hugo.toml index 9ccaa80..c9794c5 100755 --- a/exampleSite/hugo.toml +++ b/exampleSite/hugo.toml @@ -38,40 +38,23 @@ pagerSize = 10 path = 'page' -############################# Modules ############################ -[module] -[[module.mounts]] -source = "assets" -target = "assets" - -[[module.mounts]] -source = "hugo_stats.json" -target = "assets/watching/hugo_stats.json" - ############################# Build ############################## [build] -noJSConfigInAssets = false -useResourceCacheWhen = 'fallback' [build.buildStats] enable = true [[build.cachebusters]] -source = 'assets/watching/hugo_stats\.json' -target = 'style\.css' -[[build.cachebusters]] -source = '(postcss|tailwind)\.config\.js' +source = 'assets/notwatching/hugo_stats\.json' target = 'css' -[[build.cachebusters]] -source = 'assets/.*\.(js|ts|jsx|tsx)' -target = 'js' -[[build.cachebusters]] -source = 'assets/.*\.(css|scss|sass)' -target = 'css' -[[build.cachebusters]] -source = 'data/.*\.(.*)$' -target = 'css' -[[build.cachebusters]] -source = 'assets/.*\.(.*)$' -target = '$1' + +############################# Modules ############################ +[module] +[[module.mounts]] +source = 'assets' +target = 'assets' +[[module.mounts]] +disableWatch = true +source = 'hugo_stats.json' +target = 'assets/notwatching/hugo_stats.json' ############################# Outputs ############################ diff --git a/exampleSite/tailwind.config.js b/exampleSite/tailwind.config.js deleted file mode 100755 index c8754a7..0000000 --- a/exampleSite/tailwind.config.js +++ /dev/null @@ -1,103 +0,0 @@ -const fs = require("fs"); -const path = require("path"); -const themePath = path.join(__dirname, "data/theme.json"); -const themeRead = fs.readFileSync(themePath, "utf8"); -const theme = JSON.parse(themeRead); - -let font_base = Number(theme.fonts.font_size.base.replace("px", "")); -let font_scale = Number(theme.fonts.font_size.scale); -let h6 = font_scale; -let h5 = h6 * font_scale; -let h4 = h5 * font_scale; -let h3 = h4 * font_scale; -let h2 = h3 * font_scale; -let h1 = h2 * font_scale; -let fontPrimary, fontPrimaryType, fontSecondary, fontSecondaryType; -if (theme.fonts.font_family.primary) { - fontPrimary = theme.fonts.font_family.primary - .replace(/\+/g, " ") - .replace(/:[ital,]*[ital@]*[wght@]*[0-9,;.]+/gi, ""); - fontPrimaryType = theme.fonts.font_family.primary_type; -} -if (theme.fonts.font_family.secondary) { - fontSecondary = theme.fonts.font_family.secondary - .replace(/\+/g, " ") - .replace(/:[ital,]*[ital@]*[wght@]*[0-9,;.]+/gi, ""); - fontSecondaryType = theme.fonts.font_family.secondary_type; -} - -/** @type {import('tailwindcss').Config} */ -module.exports = { - content: ["./hugo_stats.json"], - safelist: [{ pattern: /^swiper-/ }], - darkMode: "class", - theme: { - screens: { - sm: "540px", - md: "768px", - lg: "1024px", - xl: "1280px", - "2xl": "1536px", - }, - container: { - center: true, - padding: "2rem", - }, - extend: { - colors: { - text: theme.colors.default.text_color.default, - light: theme.colors.default.text_color.light, - dark: theme.colors.default.text_color.dark, - primary: theme.colors.default.theme_color.primary, - secondary: theme.colors.default.theme_color.secondary, - body: theme.colors.default.theme_color.body, - border: theme.colors.default.theme_color.border, - "theme-light": theme.colors.default.theme_color.theme_light, - "theme-dark": theme.colors.default.theme_color.theme_dark, - darkmode: { - text: theme.colors.darkmode.text_color.default, - light: theme.colors.darkmode.text_color.light, - dark: theme.colors.darkmode.text_color.dark, - primary: theme.colors.darkmode.theme_color.primary, - secondary: theme.colors.darkmode.theme_color.secondary, - body: theme.colors.darkmode.theme_color.body, - border: theme.colors.darkmode.theme_color.border, - "theme-light": theme.colors.darkmode.theme_color.theme_light, - "theme-dark": theme.colors.darkmode.theme_color.theme_dark, - }, - }, - fontSize: { - base: font_base + "px", - "base-sm": font_base * 0.8 + "px", - h1: h1 + "rem", - "h1-sm": h1 * 0.9 + "rem", - h2: h2 + "rem", - "h2-sm": h2 * 0.9 + "rem", - h3: h3 + "rem", - "h3-sm": h3 * 0.9 + "rem", - h4: h4 + "rem", - h5: h5 + "rem", - h6: h6 + "rem", - }, - fontFamily: { - primary: [fontPrimary, fontPrimaryType], - secondary: [fontSecondary, fontSecondaryType], - }, - }, - }, - plugins: [ - require("@tailwindcss/typography"), - require("@tailwindcss/forms"), - require("tailwind-bootstrap-grid")({ - generateContainer: false, - gridGutterWidth: "2rem", - gridGutters: { - 1: "0.25rem", - 2: "0.5rem", - 3: "1rem", - 4: "1.5rem", - 5: "3rem", - }, - }), - ], -}; diff --git a/layouts/partials/essentials/header.html b/layouts/partials/essentials/header.html index 15749fa..fe8fc51 100755 --- a/layouts/partials/essentials/header.html +++ b/layouts/partials/essentials/header.html @@ -111,10 +111,15 @@ {{ if .enable }}