diff --git a/src/back/colors.ts b/src/back/colors.ts index 26c38ce..98fdca0 100644 --- a/src/back/colors.ts +++ b/src/back/colors.ts @@ -7,13 +7,13 @@ export const colors: Record> = { purple: "#B10DC9", fuchsia: "#F012BE", maroon: "#85144b", - red: "#ff4136", + red: "#fb2e38", orange: "#ff851b", yellow: "#ffdc00", olive: "#3d9970", - green: "#2ecc40", + green: "#58fe54", lime: "#01ff70", - black: "#111111", + black: "#1a1a1a", gray: "#aaaaaa", }, }; @@ -31,15 +31,15 @@ colors.brand = {}; // "text-accent2" is same as above, but based on the second accent color // "text-on-accent" - what color text should be when put on a background colored with accent color // "text-on-accent2" - what color text should be when put on a background colored with accent2 color -colors.brand["canvas"] = "#fff"; -colors.brand["text-bg"] = "#f6f6f6"; -colors.brand["text-fg"] = colors.basic!.black!; -colors.brand["accent"] = "#5294A1"; -colors.brand["accent2"] = "#65397C"; +colors.brand["canvas"] = "#000"; +colors.brand["text-bg"] = colors.basic!.black!; +colors.brand["text-fg"] = "#fff"; +colors.brand["accent"] = colors.basic!.red!; +colors.brand["accent2"] = "#000"; colors.brand["text-accent"] = colors.brand.accent!; -colors.brand["text-accent2"] = colors.brand["accent2"]!; +colors.brand["text-accent2"] = colors.basic!.green!; colors.brand["text-on-accent"] = "#fff"; -colors.brand["text-on-accent2"] = "#fff"; +colors.brand["text-on-accent2"] = colors.basic!.green!; // configure hue variance across the shades of the same main color. const hue_step = -4; diff --git a/src/back/defaultHead.tsx b/src/back/defaultHead.tsx index 6590b9a..7fc550a 100644 --- a/src/back/defaultHead.tsx +++ b/src/back/defaultHead.tsx @@ -56,7 +56,6 @@ export function defaultHead({ as="font" type="font/woff2" /> - ${metaImage ? `` : ""} ${[ diff --git a/src/back/global_styles/vars.css b/src/back/global_styles/vars.css index 32d3c97..1a9420a 100644 --- a/src/back/global_styles/vars.css +++ b/src/back/global_styles/vars.css @@ -40,6 +40,15 @@ --container-width: 50rem; /* Fonts */ - --font-sans-serif: "Inter UI", sans-serif; + --font-sans-serif: -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, + helvetica neue, Cantarell, Ubuntu, roboto, noto, helvetica, arial, sans-serif; --font-slab-serif: "Zilla Slab", serif; + --font-serif: Iowan Old Style, Apple Garamond, Baskerville, Times New Roman, + Droid Serif, Times, Source Serif Pro, serif, Apple Color Emoji, Segoe UI Emoji, + Segoe UI Symbol; + --font-mono: Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, monospace; + + --font-headings: var(--font-sans-serif); + --font-short-text: var(--font-sans-serif); + --font-long-text: var(--font-serif); } diff --git a/src/back/jdd-components/autoscrolling-images/autoscrolling-images.css b/src/back/jdd-components/autoscrolling-images/autoscrolling-images.css index c463391..482f739 100644 --- a/src/back/jdd-components/autoscrolling-images/autoscrolling-images.css +++ b/src/back/jdd-components/autoscrolling-images/autoscrolling-images.css @@ -18,7 +18,7 @@ } .autoscrolling-images__title { - font-family: Exotc350DmBdEU; + font-family: var(--font-headings); font-size: 32px; color: var(--color-brand-text-accent); margin: 0; diff --git a/src/back/jdd-components/autoscrolling-images/autoscrolling-images.jdd.tsx b/src/back/jdd-components/autoscrolling-images/autoscrolling-images.jdd.tsx index 7886274..4904e29 100644 --- a/src/back/jdd-components/autoscrolling-images/autoscrolling-images.jdd.tsx +++ b/src/back/jdd-components/autoscrolling-images/autoscrolling-images.jdd.tsx @@ -126,7 +126,6 @@ export class AutoscrollingImages extends Component { const radioButtonIdPrefix = "r" + Math.floor(100 + Math.random() * 900); const radioButton_name = `autoscrolling-images__radio--${radioButtonIdPrefix}`; - const titleUpperCase = title.toUpperCase(); return (
{ data-carousel-id-prefix={radioButtonIdPrefix} >
-

{titleUpperCase}

+

{title}