From fef14e4b4c86d66b98af8b4b0c8352695a1a3bbc Mon Sep 17 00:00:00 2001 From: George Cushen Date: Fri, 24 Nov 2023 14:48:34 +0000 Subject: [PATCH] feat: add more color themes also - rename theme_default to mode - port feedback comp --- modules/blox-tailwind/assets/css/main.css | 28 +++++++++ modules/blox-tailwind/assets/css/styles.css | 1 - .../blox-tailwind/assets/css/themes/blue.css | 27 ++++++++ .../blox-tailwind/assets/css/themes/cyan.css | 14 +++++ .../assets/css/themes/default.css | 37 ----------- .../blox-tailwind/assets/css/themes/green.css | 14 +++++ .../assets/css/themes/indigo.css | 14 +++++ .../assets/css/themes/purple.css | 14 +++++ .../blox-tailwind/assets/css/themes/red.css | 14 +++++ .../blox-tailwind/assets/css/themes/rose.css | 14 +++++ .../blox-tailwind/assets/css/themes/sky.css | 14 +++++ .../blox-tailwind/assets/css/themes/teal.css | 14 +++++ .../blox-tailwind/assets/css/themes/zinc.css | 14 +++++ .../layouts/_default/baseof.html | 2 +- .../blox-tailwind/layouts/_default/terms.html | 2 +- .../layouts/partials/components/feedback.html | 36 +++++++++++ .../layouts/partials/site_head.html | 10 +++ .../blox-tailwind/layouts/partials/tags.html | 2 +- modules/blox-tailwind/tailwind.config.js | 62 +++++++++---------- 19 files changed, 261 insertions(+), 72 deletions(-) create mode 100644 modules/blox-tailwind/assets/css/themes/blue.css create mode 100644 modules/blox-tailwind/assets/css/themes/cyan.css delete mode 100644 modules/blox-tailwind/assets/css/themes/default.css create mode 100644 modules/blox-tailwind/assets/css/themes/green.css create mode 100644 modules/blox-tailwind/assets/css/themes/indigo.css create mode 100644 modules/blox-tailwind/assets/css/themes/purple.css create mode 100644 modules/blox-tailwind/assets/css/themes/red.css create mode 100644 modules/blox-tailwind/assets/css/themes/rose.css create mode 100644 modules/blox-tailwind/assets/css/themes/sky.css create mode 100644 modules/blox-tailwind/assets/css/themes/teal.css create mode 100644 modules/blox-tailwind/assets/css/themes/zinc.css create mode 100644 modules/blox-tailwind/layouts/partials/components/feedback.html diff --git a/modules/blox-tailwind/assets/css/main.css b/modules/blox-tailwind/assets/css/main.css index d01845a7..5c37db79 100644 --- a/modules/blox-tailwind/assets/css/main.css +++ b/modules/blox-tailwind/assets/css/main.css @@ -1,3 +1,31 @@ +:root { + /* TW Neutral */ + --color-neutral-50: 250 250 250; + --color-neutral-100: 245 245 245; + --color-neutral-200: 229 229 229; + --color-neutral-300: 212 212 212; + --color-neutral-400: 163 163 163; + --color-neutral-500: 115 115 115; + --color-neutral-600: 82 82 82; + --color-neutral-700: 64 64 64; + --color-neutral-800: 38 38 38; + --color-neutral-900: 23 23 23; + --color-neutral-950: 10 10 10; + + /* TW Zinc */ + --color-secondary-50: 250 250 250; + --color-secondary-100: 244 244 245; + --color-secondary-200: 228 228 231; + --color-secondary-300: 212 212 216; + --color-secondary-400: 161 161 170; + --color-secondary-500: 113 113 122; + --color-secondary-600: 82 82 91; + --color-secondary-700: 63 63 70; + --color-secondary-800: 39 39 42; + --color-secondary-900: 24 24 27; + --color-secondary-950: 9 9 11; +} + .hbb-section { @apply mb-10 last:mb-0; } diff --git a/modules/blox-tailwind/assets/css/styles.css b/modules/blox-tailwind/assets/css/styles.css index 30f81033..9aed658d 100644 --- a/modules/blox-tailwind/assets/css/styles.css +++ b/modules/blox-tailwind/assets/css/styles.css @@ -5,4 +5,3 @@ @import "main.css"; @import "./components/all.css"; @import "./blox/all.css"; -@import "themes/default.css"; diff --git a/modules/blox-tailwind/assets/css/themes/blue.css b/modules/blox-tailwind/assets/css/themes/blue.css new file mode 100644 index 00000000..fdb02f6b --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/blue.css @@ -0,0 +1,27 @@ +/* Hugo Blox color theme: BLUE */ +:root { + /* TW Blue Palette */ + --color-primary-50: 239 246 255; + --color-primary-100: 219 234 254; + --color-primary-200: 191 219 254; + --color-primary-300: 147 197 253; + --color-primary-400: 96 165 250; + --color-primary-500: 59 130 246; + --color-primary-600: 37 99 235; + --color-primary-700: 29 78 216; + --color-primary-800: 30 64 175; + --color-primary-900: 30 58 138; + --color-primary-950: 23 37 84; + /* TW Cyan Palette */ + --color-secondary-50: 236 254 255; + --color-secondary-100: 207 250 254; + --color-secondary-200: 165 243 252; + --color-secondary-300: 103 232 249; + --color-secondary-400: 34 211 238; + --color-secondary-500: 6 182 212; + --color-secondary-600: 8 145 178; + --color-secondary-700: 14 116 144; + --color-secondary-800: 21 94 117; + --color-secondary-900: 22 78 99; + --color-secondary-950: 8 51 68; +} diff --git a/modules/blox-tailwind/assets/css/themes/cyan.css b/modules/blox-tailwind/assets/css/themes/cyan.css new file mode 100644 index 00000000..edbbe166 --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/cyan.css @@ -0,0 +1,14 @@ +/* Hugo Blox color theme: CYAN */ +:root { + --color-primary-50: 236 254 255; + --color-primary-100: 207 250 254; + --color-primary-200: 165 243 252; + --color-primary-300: 103 232 249; + --color-primary-400: 34 211 238; + --color-primary-500: 6 182 212; + --color-primary-600: 8 145 178; + --color-primary-700: 14 116 144; + --color-primary-800: 21 94 117; + --color-primary-900: 22 78 99; + --color-primary-950: 8 51 68; +} diff --git a/modules/blox-tailwind/assets/css/themes/default.css b/modules/blox-tailwind/assets/css/themes/default.css deleted file mode 100644 index cb3e8c6c..00000000 --- a/modules/blox-tailwind/assets/css/themes/default.css +++ /dev/null @@ -1,37 +0,0 @@ -/* Default Wowchemy color theme */ -:root { - /* Neutral */ - --color-neutral: 255, 255, 255; - --color-neutral-50: 248, 250, 252; - --color-neutral-100: 241, 245, 249; - --color-neutral-200: 226, 232, 240; - --color-neutral-300: 203, 213, 225; - --color-neutral-400: 148, 163, 184; - --color-neutral-500: 100, 116, 139; - --color-neutral-600: 71, 85, 105; - --color-neutral-700: 51, 65, 85; - --color-neutral-800: 30, 41, 59; - --color-neutral-900: 15, 23, 42; - /* TW Blue Palette */ - --color-primary-50: 239, 246, 255; - --color-primary-100: 219, 234, 254; - --color-primary-200: 191, 219, 254; - --color-primary-300: 147, 197, 253; - --color-primary-400: 96, 165, 250; - --color-primary-500: 59, 130, 246; - --color-primary-600: 37, 99, 235; - --color-primary-700: 29, 78, 216; - --color-primary-800: 30, 64, 175; - --color-primary-900: 30, 58, 138; - /* TW Cyan Palette */ - --color-secondary-50: 236, 254, 255; - --color-secondary-100: 207, 250, 254; - --color-secondary-200: 165, 243, 252; - --color-secondary-300: 103, 232, 249; - --color-secondary-400: 34, 211, 238; - --color-secondary-500: 6, 182, 212; - --color-secondary-600: 8, 145, 178; - --color-secondary-700: 14, 116, 144; - --color-secondary-800: 21, 94, 117; - --color-secondary-900: 22, 78, 99; -} diff --git a/modules/blox-tailwind/assets/css/themes/green.css b/modules/blox-tailwind/assets/css/themes/green.css new file mode 100644 index 00000000..b08f3bea --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/green.css @@ -0,0 +1,14 @@ +/* Hugo Blox color theme: GREEN */ +:root { + --color-primary-50: 240 253 244; + --color-primary-100: 220 252 231; + --color-primary-200: 187 247 208; + --color-primary-300: 134 239 172; + --color-primary-400: 74 222 128; + --color-primary-500: 34 197 94; + --color-primary-600: 22 163 74; + --color-primary-700: 21 128 61; + --color-primary-800: 22 101 52; + --color-primary-900: 20 83 45; + --color-primary-950: 5 46 22; +} diff --git a/modules/blox-tailwind/assets/css/themes/indigo.css b/modules/blox-tailwind/assets/css/themes/indigo.css new file mode 100644 index 00000000..cf1c4bdd --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/indigo.css @@ -0,0 +1,14 @@ +/* Hugo Blox color theme: INDIGO */ +:root { + --color-primary-50: 238 242 255; + --color-primary-100: 224 231 255; + --color-primary-200: 199 210 254; + --color-primary-300: 165 180 252; + --color-primary-400: 129 140 248; + --color-primary-500: 99 102 241; + --color-primary-600: 79 70 229; + --color-primary-700: 67 56 202; + --color-primary-800: 55 48 163; + --color-primary-900: 49 46 129; + --color-primary-950: 30 27 75; +} diff --git a/modules/blox-tailwind/assets/css/themes/purple.css b/modules/blox-tailwind/assets/css/themes/purple.css new file mode 100644 index 00000000..8f4a4bd3 --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/purple.css @@ -0,0 +1,14 @@ +/* Hugo Blox color theme: PURPLE */ +:root { + --color-primary-50: 250 245 255; + --color-primary-100: 243 232 255; + --color-primary-200: 233 213 255; + --color-primary-300: 216 180 254; + --color-primary-400: 192 132 252; + --color-primary-500: 168 85 247; + --color-primary-600: 147 51 234; + --color-primary-700: 126 34 206; + --color-primary-800: 107 33 168; + --color-primary-900: 88 28 135; + --color-primary-950: 59 7 100; +} diff --git a/modules/blox-tailwind/assets/css/themes/red.css b/modules/blox-tailwind/assets/css/themes/red.css new file mode 100644 index 00000000..d00af70b --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/red.css @@ -0,0 +1,14 @@ +/* Hugo Blox color theme: RED */ +:root { + --color-primary-50: 254 242 242; + --color-primary-100: 254 226 226; + --color-primary-200: 254 202 202; + --color-primary-300: 252 165 165; + --color-primary-400: 248 113 113; + --color-primary-500: 239 68 68; + --color-primary-600: 220 38 38; + --color-primary-700: 185 28 28; + --color-primary-800: 153 27 27; + --color-primary-900: 127 29 29; + --color-primary-950: 69 10 10; +} diff --git a/modules/blox-tailwind/assets/css/themes/rose.css b/modules/blox-tailwind/assets/css/themes/rose.css new file mode 100644 index 00000000..80a73088 --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/rose.css @@ -0,0 +1,14 @@ +/* Hugo Blox color theme: ROSE */ +:root { + --color-primary-50: 255 241 242; + --color-primary-100: 255 228 230; + --color-primary-200: 254 205 211; + --color-primary-300: 253 164 175; + --color-primary-400: 251 113 133; + --color-primary-500: 244 63 94; + --color-primary-600: 225 29 72; + --color-primary-700: 190 18 60; + --color-primary-800: 159 18 57; + --color-primary-900: 136 19 55; + --color-primary-950: 76 5 25; +} diff --git a/modules/blox-tailwind/assets/css/themes/sky.css b/modules/blox-tailwind/assets/css/themes/sky.css new file mode 100644 index 00000000..c842d9dd --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/sky.css @@ -0,0 +1,14 @@ +/* Hugo Blox color theme: SKY */ +:root { + --color-primary-50: 240 249 255; + --color-primary-100: 224 242 254; + --color-primary-200: 186 230 253; + --color-primary-300: 125 211 252; + --color-primary-400: 56 189 248; + --color-primary-500: 14 165 233; + --color-primary-600: 2 132 199; + --color-primary-700: 3 105 161; + --color-primary-800: 7 89 133; + --color-primary-900: 12 74 110; + --color-primary-950: 8 47 73; +} diff --git a/modules/blox-tailwind/assets/css/themes/teal.css b/modules/blox-tailwind/assets/css/themes/teal.css new file mode 100644 index 00000000..6ea2e784 --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/teal.css @@ -0,0 +1,14 @@ +/* Hugo Blox color theme: TEAL */ +:root { + --color-primary-50: 240 253 250; + --color-primary-100: 204 251 241; + --color-primary-200: 153 246 228; + --color-primary-300: 94 234 212; + --color-primary-400: 45 212 191; + --color-primary-500: 20 184 166; + --color-primary-600: 13 148 136; + --color-primary-700: 15 118 110; + --color-primary-800: 17 94 89; + --color-primary-900: 19 78 74; + --color-primary-950: 4 47 46; +} diff --git a/modules/blox-tailwind/assets/css/themes/zinc.css b/modules/blox-tailwind/assets/css/themes/zinc.css new file mode 100644 index 00000000..6a6210d6 --- /dev/null +++ b/modules/blox-tailwind/assets/css/themes/zinc.css @@ -0,0 +1,14 @@ +/* Hugo Blox color theme: ZINC */ +:root { + --color-primary-50: 250 250 250; + --color-primary-100: 244 244 245; + --color-primary-200: 228 228 231; + --color-primary-300: 212 212 216; + --color-primary-400: 161 161 170; + --color-primary-500: 113 113 122; + --color-primary-600: 82 82 91; + --color-primary-700: 63 63 70; + --color-primary-800: 39 39 42; + --color-primary-900: 24 24 27; + --color-primary-950: 9 9 11; +} diff --git a/modules/blox-tailwind/layouts/_default/baseof.html b/modules/blox-tailwind/layouts/_default/baseof.html index 6be28e37..f6eb7c0c 100644 --- a/modules/blox-tailwind/layouts/_default/baseof.html +++ b/modules/blox-tailwind/layouts/_default/baseof.html @@ -3,7 +3,7 @@ {{ printf "" (now | time.Format ":date_long") | safeHTML }} {{- $language_code := site.LanguageCode | default "en-us" -}} + data-wc-theme-default="{{ (lower site.Params.appearance.mode) | default "system" }}"> {{ partial "site_head" . }}
diff --git a/modules/blox-tailwind/layouts/_default/terms.html b/modules/blox-tailwind/layouts/_default/terms.html index b2e6103b..bbd10d62 100644 --- a/modules/blox-tailwind/layouts/_default/terms.html +++ b/modules/blox-tailwind/layouts/_default/terms.html @@ -18,7 +18,7 @@ {{ .Name }} - + {{ $count }} diff --git a/modules/blox-tailwind/layouts/partials/components/feedback.html b/modules/blox-tailwind/layouts/partials/components/feedback.html new file mode 100644 index 00000000..ebb713c6 --- /dev/null +++ b/modules/blox-tailwind/layouts/partials/components/feedback.html @@ -0,0 +1,36 @@ +{{/* TODO: port JS & response text from Bootstrap module. Re-integrate with GA plus Fathom/Plausible */}} +{{/* $ga := site.Params.marketing.analytics.google_analytics | default site.GoogleAnalytics | default "" */}} +{{ $show_feedback := .Params.feedback | default true }} + +{{ if hugo.IsProduction | and $show_feedback }}{{/* | and $ga */}} +
+
+
+ {{ i18n "feedback_widget_question" | default "Was this page helpful?" }} +
+
+
+ 😞 +
+
+ 😐 +
+
+ 🤩 +
+
+
+
+{{ end }} diff --git a/modules/blox-tailwind/layouts/partials/site_head.html b/modules/blox-tailwind/layouts/partials/site_head.html index 369d5046..5a4273b1 100644 --- a/modules/blox-tailwind/layouts/partials/site_head.html +++ b/modules/blox-tailwind/layouts/partials/site_head.html @@ -45,6 +45,16 @@ {{ end }} + {{/* Hugo Blox Color Theme Initialization */}} + {{ $theme_name := (lower site.Params.appearance.color) | default "blue" }} + {{ $theme_path := printf "css/themes/%s.css" $theme_name }} + {{ if not (fileExists (printf "assets/%s" $theme_path)) }} + {{ errorf "The specified color theme `%s.css` was not found in `assets/css/themes/`. Either install your custom color theme in the folder or set the `color` theme value in `params.yaml` to an existing theme such as `blue`." }} + {{ else }} + {{ $theme_css := resources.Get $theme_path | minify }} + + {{ end }} + {{/* Style */}} {{ if fileExists "assets/dist/wc.css" }} {{ $styles := resources.Get "dist/wc.css" }} diff --git a/modules/blox-tailwind/layouts/partials/tags.html b/modules/blox-tailwind/layouts/partials/tags.html index 274cd3f9..9dffbb56 100644 --- a/modules/blox-tailwind/layouts/partials/tags.html +++ b/modules/blox-tailwind/layouts/partials/tags.html @@ -2,7 +2,7 @@ {{ if .Param $taxonomy }}
{{ range $index, $value := (.GetTerms $taxonomy) }} - {{ .LinkTitle }} + {{ .LinkTitle }} {{ end }}
{{ end }} diff --git a/modules/blox-tailwind/tailwind.config.js b/modules/blox-tailwind/tailwind.config.js index 9f39e9e1..ff2294ef 100644 --- a/modules/blox-tailwind/tailwind.config.js +++ b/modules/blox-tailwind/tailwind.config.js @@ -13,41 +13,41 @@ module.exports = { extend: { colors: { neutral: { - DEFAULT: "rgba(var(--color-neutral), )", - 50: "rgba(var(--color-neutral-50), )", - 100: "rgba(var(--color-neutral-100), )", - 200: "rgba(var(--color-neutral-200), )", - 300: "rgba(var(--color-neutral-300), )", - 400: "rgba(var(--color-neutral-400), )", - 500: "rgba(var(--color-neutral-500), )", - 600: "rgba(var(--color-neutral-600), )", - 700: "rgba(var(--color-neutral-700), )", - 800: "rgba(var(--color-neutral-800), )", - 900: "rgba(var(--color-neutral-900), )", + DEFAULT: "rgb(var(--color-neutral) / )", + 50: "rgb(var(--color-neutral-50) / )", + 100: "rgb(var(--color-neutral-100) / )", + 200: "rgb(var(--color-neutral-200) / )", + 300: "rgb(var(--color-neutral-300) / )", + 400: "rgb(var(--color-neutral-400) / )", + 500: "rgb(var(--color-neutral-500) / )", + 600: "rgb(var(--color-neutral-600) / )", + 700: "rgb(var(--color-neutral-700) / )", + 800: "rgb(var(--color-neutral-800) / )", + 900: "rgb(var(--color-neutral-900) / )", }, primary: { - 50: "rgba(var(--color-primary-50), )", - 100: "rgba(var(--color-primary-100), )", - 200: "rgba(var(--color-primary-200), )", - 300: "rgba(var(--color-primary-300), )", - 400: "rgba(var(--color-primary-400), )", - 500: "rgba(var(--color-primary-500), )", - 600: "rgba(var(--color-primary-600), )", - 700: "rgba(var(--color-primary-700), )", - 800: "rgba(var(--color-primary-800), )", - 900: "rgba(var(--color-primary-900), )", + 50: "rgb(var(--color-primary-50) / )", + 100: "rgb(var(--color-primary-100) / )", + 200: "rgb(var(--color-primary-200) / )", + 300: "rgb(var(--color-primary-300) / )", + 400: "rgb(var(--color-primary-400) / )", + 500: "rgb(var(--color-primary-500) / )", + 600: "rgb(var(--color-primary-600) / )", + 700: "rgb(var(--color-primary-700) / )", + 800: "rgb(var(--color-primary-800) / )", + 900: "rgb(var(--color-primary-900) / )", }, secondary: { - 50: "rgba(var(--color-secondary-50), )", - 100: "rgba(var(--color-secondary-100), )", - 200: "rgba(var(--color-secondary-200), )", - 300: "rgba(var(--color-secondary-300), )", - 400: "rgba(var(--color-secondary-400), )", - 500: "rgba(var(--color-secondary-500), )", - 600: "rgba(var(--color-secondary-600), )", - 700: "rgba(var(--color-secondary-700), )", - 800: "rgba(var(--color-secondary-800), )", - 900: "rgba(var(--color-secondary-900), )", + 50: "rgb(var(--color-secondary-50) / )", + 100: "rgb(var(--color-secondary-100) / )", + 200: "rgb(var(--color-secondary-200) / )", + 300: "rgb(var(--color-secondary-300) / )", + 400: "rgb(var(--color-secondary-400) / )", + 500: "rgb(var(--color-secondary-500) / )", + 600: "rgb(var(--color-secondary-600) / )", + 700: "rgb(var(--color-secondary-700) / )", + 800: "rgb(var(--color-secondary-800) / )", + 900: "rgb(var(--color-secondary-900) / )", }, }, fontFamily: {