From 54009e0f91ea38f8d566636fc7b7488dd762a1e9 Mon Sep 17 00:00:00 2001 From: WANG Chucheng Date: Wed, 23 Mar 2022 21:50:15 -0400 Subject: feat: add configurable colors and fonts --- assets/css/base.css | 31 ++++++++++++++++--------------- assets/css/tailwind.config.js | 4 ++-- 2 files changed, 18 insertions(+), 17 deletions(-) (limited to 'assets') diff --git a/assets/css/base.css b/assets/css/base.css index db1115f..1ab2bb6 100644 --- a/assets/css/base.css +++ b/assets/css/base.css @@ -1,22 +1,23 @@ :root { - @apply bg-primary-bg text-secondary-text font-serif; - --color-eureka: #38b2ac; - --color-primary-bg: rgba(242, 242, 247, 1); - --color-secondary-bg: rgba(255, 255, 255, 1); - --color-tertiary-bg: rgba(242, 242, 247, 1); - --color-primary-text: rgba(0, 0, 0, 0.85); - --color-secondary-text: rgba(0, 0, 0, 0.7); - --color-tertiary-text: rgba(0, 0, 0, 0.55); + @apply bg-primary-bg text-secondary-text font-eureka; + --color-eureka: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "light" "theme")) }}; + --color-primary-bg: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "light" "primaryBackground")) }}; + --color-secondary-bg: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "light" "secondaryBackground")) }}; + --color-tertiary-bg: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "light" "tertiaryBackground")) }}; + --color-primary-text: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "light" "primaryText")) }}; + --color-secondary-text: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "light" "secondaryText")) }}; + --color-tertiary-text: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "light" "tertiaryText")) }}; + --fonts-eureka: {{ $fonts := partial "utils/get-style-fonts" (dict "context" . "param" "name") }}{{ range $index, $value := $fonts }}{{ if gt $index 0 }},{{ end }}{{ $value }}{{ else }}""{{ end }} } .dark { - --color-eureka: #38b2ac; - --color-primary-bg: rgba(0, 0, 0, 1); - --color-secondary-bg: rgba(28, 28, 30, 1); - --color-tertiary-bg: rgba(44, 44, 46, 1); - --color-primary-text: rgba(255, 255, 255, 0.85); - --color-secondary-text: rgba(255, 255, 255, 0.7); - --color-tertiary-text: rgba(255, 255, 255, 0.55); + --color-eureka: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "dark" "theme")) }}; + --color-primary-bg: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "dark" "primaryBackground")) }}; + --color-secondary-bg: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "dark" "secondaryBackground")) }}; + --color-tertiary-bg: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "dark" "tertiaryBackground")) }}; + --color-primary-text: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "dark" "primaryText")) }}; + --color-secondary-text: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "dark" "secondaryText")) }}; + --color-tertiary-text: {{ partial "utils/get-style-color" (dict "context" . "path" (slice "dark" "tertiaryText")) }}; } h1, diff --git a/assets/css/tailwind.config.js b/assets/css/tailwind.config.js index e831185..bc282a1 100644 --- a/assets/css/tailwind.config.js +++ b/assets/css/tailwind.config.js @@ -1,4 +1,5 @@ const themeDir = __dirname + "/../../"; +const defaultTheme = require("tailwindcss/defaultTheme"); module.exports = { important: true, @@ -11,8 +12,7 @@ module.exports = { ], theme: { fontFamily: { - serif: ["Lora", "Noto Serif SC", "serif"], - mono: ["SFMono-Regular", "Menlo", "monospace"], + eureka: ["var(--fonts-eureka)", ...defaultTheme.fontFamily.serif], }, extend: { height: { -- cgit v1.2.3