diff --git a/src/main.ts b/src/main.ts index 648fbb3..4ef3636 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,8 +1,3 @@ -import "./styles/tailwind.css"; -import "./styles/style.scss"; -import "./styles/theme.scss"; -import "./styles/font-hack.scss"; - import Alpine from "alpinejs"; import upvote from "./upvote"; import * as tocbot from 'tocbot'; diff --git a/src/styles/font-pixel.scss b/src/styles/font-pixel.scss new file mode 100644 index 0000000..c477011 --- /dev/null +++ b/src/styles/font-pixel.scss @@ -0,0 +1,4 @@ + @font-face { + font-family: Ark-Pixel-12-proportional-zh_cn; + src: url("../fonts/fusion-pixel-12px-proportional-zh_hans.woff2"); +} diff --git a/src/styles/main.scss b/src/styles/main.scss index 8b36901..58fbd50 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -10,11 +10,6 @@ html { box-sizing: inherit; } -@font-face { - font-family: Ark-Pixel-12-proportional-zh_cn; - src: url("../fonts/fusion-pixel-12px-proportional-zh_hans.woff2"); -} - body { margin: 0; padding: 0; diff --git a/src/styles/style.scss b/src/styles/style.scss index dd57a6a..46b1935 100644 --- a/src/styles/style.scss +++ b/src/styles/style.scss @@ -1,3 +1,7 @@ +@tailwind base; +@tailwind utilities; +@tailwind components; + @import 'buttons'; @import 'header'; @import 'logo'; @@ -6,3 +10,5 @@ @import 'pagination'; @import 'footer'; @import 'typed-text'; + +@import 'theme'; \ No newline at end of file diff --git a/templates/modules/layout.html b/templates/modules/layout.html index 0e62a6b..a5c8a67 100644 --- a/templates/modules/layout.html +++ b/templates/modules/layout.html @@ -5,13 +5,17 @@