From 2faf9f56d34bb079ea316612d7a744285a0ab99f Mon Sep 17 00:00:00 2001 From: Carl Johnson Date: Mon, 11 Sep 2023 13:30:54 -0400 Subject: [PATCH] Basic brand colors, fonts --- assets/css/fonts.css | 301 +++++++++++++----- assets/css/main.css | 7 +- layouts/_default/baseof.html | 35 +- layouts/_default/{index.html => home.html} | 20 +- layouts/_default/list.html | 10 +- layouts/_default/person.html | 18 +- layouts/_default/terms.html | 2 +- layouts/partials/footer.html | 6 +- layouts/partials/nav.html | 12 +- layouts/partials/pages-list.html | 2 +- layouts/partials/search.html | 2 +- .../montserrat-v25-latin-100.woff2 | Bin 0 -> 11624 bytes .../montserrat-v25-latin-100italic.woff2 | Bin 0 -> 12000 bytes .../montserrat-v25-latin-200.woff2 | Bin 0 -> 12504 bytes .../montserrat-v25-latin-200italic.woff2 | Bin 0 -> 12776 bytes .../montserrat-v25-latin-300.woff2 | Bin 0 -> 12580 bytes .../montserrat-v25-latin-300italic.woff2 | Bin 0 -> 12964 bytes .../montserrat-v25-latin-500.woff2 | Bin 0 -> 12820 bytes .../montserrat-v25-latin-500italic.woff2 | Bin 0 -> 13188 bytes .../montserrat-v25-latin-600.woff2 | Bin 0 -> 12700 bytes .../montserrat-v25-latin-600italic.woff2 | Bin 0 -> 13208 bytes .../montserrat-v25-latin-700.woff2 | Bin 0 -> 12848 bytes .../montserrat-v25-latin-700italic.woff2 | Bin 0 -> 13384 bytes .../montserrat-v25-latin-800.woff2 | Bin 0 -> 12896 bytes .../montserrat-v25-latin-800italic.woff2 | Bin 0 -> 13412 bytes .../montserrat-v25-latin-900.woff2 | Bin 0 -> 12048 bytes .../montserrat-v25-latin-900italic.woff2 | Bin 0 -> 12432 bytes .../montserrat-v25-latin-italic.woff2 | Bin 0 -> 12996 bytes .../montserrat-v25-latin-regular.woff2 | Bin 0 -> 12708 bytes .../roboto-slab-v32-latin-100.woff2 | Bin 0 -> 13432 bytes .../roboto-slab-v32-latin-200.woff2 | Bin 0 -> 14140 bytes .../roboto-slab-v32-latin-300.woff2 | Bin 0 -> 14144 bytes .../roboto-slab-v32-latin-500.woff2 | Bin 0 -> 14396 bytes .../roboto-slab-v32-latin-600.woff2 | Bin 0 -> 14392 bytes .../roboto-slab-v32-latin-700.woff2 | Bin 0 -> 14276 bytes .../roboto-slab-v32-latin-800.woff2 | Bin 0 -> 14380 bytes .../roboto-slab-v32-latin-900.woff2 | Bin 0 -> 14436 bytes .../roboto-slab-v32-latin-regular.woff2 | Bin 0 -> 14032 bytes tailwind.config.js | 11 +- 39 files changed, 297 insertions(+), 129 deletions(-) rename layouts/_default/{index.html => home.html} (85%) create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-100.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-100italic.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-200.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-200italic.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-300.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-300italic.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-500.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-500italic.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-600.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-600italic.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-700.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-700italic.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-800.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-800italic.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-900.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-900italic.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-italic.woff2 create mode 100644 static/css/fonts/montserrat-v25/montserrat-v25-latin-regular.woff2 create mode 100644 static/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-100.woff2 create mode 100644 static/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-200.woff2 create mode 100644 static/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-300.woff2 create mode 100644 static/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-500.woff2 create mode 100644 static/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-600.woff2 create mode 100644 static/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-700.woff2 create mode 100644 static/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-800.woff2 create mode 100644 static/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-900.woff2 create mode 100644 static/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-regular.woff2 diff --git a/assets/css/fonts.css b/assets/css/fonts.css index 902d97f..0f46e16 100644 --- a/assets/css/fonts.css +++ b/assets/css/fonts.css @@ -1,105 +1,244 @@ -/* eb-garamond-regular - latin */ +/* montserrat-100 - latin */ @font-face { - font-display: fallback; - font-family: "EB Garamond"; + font-display: swap; + font-family: "Montserrat"; + font-style: normal; + font-weight: 100; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-100.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-100italic - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; + font-style: italic; + font-weight: 100; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-100italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-200 - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; + font-style: normal; + font-weight: 200; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-200.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-200italic - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; + font-style: italic; + font-weight: 200; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-200italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-300 - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; + font-style: normal; + font-weight: 300; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-300.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-300italic - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; + font-style: italic; + font-weight: 300; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-300italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-regular - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; font-style: normal; font-weight: 400; - src: - local(""), - url("/css/fonts/eb-garamond-v19/eb-garamond-v19-latin-regular.woff2") - format("woff2"), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url("/css/fonts/eb-garamond-v19/eb-garamond-v19-latin-regular.woff") - format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-regular.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* eb-garamond-600 - latin */ +/* montserrat-italic - latin */ @font-face { - font-display: fallback; - font-family: "EB Garamond"; + font-display: swap; + font-family: "Montserrat"; + font-style: italic; + font-weight: 400; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-500 - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; + font-style: normal; + font-weight: 500; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-500.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-500italic - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; + font-style: italic; + font-weight: 500; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-500italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-600 - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; font-style: normal; font-weight: 600; - src: - local(""), - url("/css/fonts/eb-garamond-v19/eb-garamond-v19-latin-600.woff2") - format("woff2"), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url("/css/fonts/eb-garamond-v19/eb-garamond-v19-latin-600.woff") - format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} -/* eb-garamond-italic - latin */ -@font-face { - font-display: fallback; - font-family: "EB Garamond"; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-600.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-600italic - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; font-style: italic; - font-weight: 400; - src: - local(""), - url("/css/fonts/eb-garamond-v19/eb-garamond-v19-latin-italic.woff2") - format("woff2"), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url("/css/fonts/eb-garamond-v19/eb-garamond-v19-latin-italic.woff") - format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ -} -/* eb-garamond-700italic - latin */ -@font-face { - font-display: fallback; - font-family: "EB Garamond"; + font-weight: 600; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-600italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-700 - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; + font-style: normal; + font-weight: 700; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-700.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-700italic - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; font-style: italic; font-weight: 700; - src: - local(""), - url("/css/fonts/eb-garamond-v19/eb-garamond-v19-latin-700italic.woff2") - format("woff2"), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url("/css/fonts/eb-garamond-v19/eb-garamond-v19-latin-700italic.woff") - format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-700italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } - -/* lora-regular - latin */ +/* montserrat-800 - latin */ @font-face { - font-display: fallback; - font-family: "Lora"; + font-display: swap; + font-family: "Montserrat"; font-style: normal; - font-weight: 400; - src: - local(""), - url("/css/fonts/lora-v20/lora-v20-latin-regular.woff2") format("woff2"), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url("/css/fonts/lora-v20/lora-v20-latin-regular.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + font-weight: 800; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-800.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* lora-600 - latin */ +/* montserrat-800italic - latin */ @font-face { - font-display: fallback; - font-family: "Lora"; + font-display: swap; + font-family: "Montserrat"; + font-style: italic; + font-weight: 800; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-800italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* montserrat-900 - latin */ +@font-face { + font-display: swap; + font-family: "Montserrat"; font-style: normal; - font-weight: 600; - src: - local(""), - url("/css/fonts/lora-v20/lora-v20-latin-600.woff2") format("woff2"), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url("/css/fonts/lora-v20/lora-v20-latin-600.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + font-weight: 900; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-900.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* lora-italic - latin */ +/* montserrat-900italic - latin */ @font-face { - font-display: fallback; - font-family: "Lora"; + font-display: swap; + font-family: "Montserrat"; font-style: italic; + font-weight: 900; + src: url("/css/fonts/montserrat-v25/montserrat-v25-latin-900italic.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} + +/* roboto-slab-100 - latin */ +@font-face { + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; + font-weight: 100; + src: url("/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-100.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* roboto-slab-200 - latin */ +@font-face { + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; + font-weight: 200; + src: url("/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-200.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* roboto-slab-300 - latin */ +@font-face { + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; + font-weight: 300; + src: url("/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-300.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* roboto-slab-regular - latin */ +@font-face { + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; font-weight: 400; - src: - local(""), - url("/css/fonts/lora-v20/lora-v20-latin-italic.woff2") format("woff2"), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url("/css/fonts/lora-v20/lora-v20-latin-italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + src: url("/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-regular.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } -/* lora-600italic - latin */ +/* roboto-slab-500 - latin */ @font-face { - font-display: fallback; - font-family: "Lora"; - font-style: italic; + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; + font-weight: 500; + src: url("/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-500.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* roboto-slab-600 - latin */ +@font-face { + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; font-weight: 600; - src: - local(""), - url("/css/fonts/lora-v20/lora-v20-latin-600italic.woff2") format("woff2"), - /* Chrome 26+, Opera 23+, Firefox 39+ */ - url("/css/fonts/lora-v20/lora-v20-latin-600italic.woff") format("woff"); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + src: url("/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-600.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* roboto-slab-700 - latin */ +@font-face { + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; + font-weight: 700; + src: url("/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-700.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* roboto-slab-800 - latin */ +@font-face { + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; + font-weight: 800; + src: url("/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-800.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ +} +/* roboto-slab-900 - latin */ +@font-face { + font-display: swap; + font-family: "Roboto Slab"; + font-style: normal; + font-weight: 900; + src: url("/css/fonts/roboto-slab-v32/roboto-slab-v32-latin-900.woff2") + format("woff2"); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */ } diff --git a/assets/css/main.css b/assets/css/main.css index a83248b..955a7f4 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,3 +1,4 @@ +@import "./fonts.css"; @tailwind base; html { @@ -42,7 +43,7 @@ html { } .content-area a:hover { - @apply text-yellow; + @apply text-blue-darker; } .content-area > p + p, @@ -73,12 +74,12 @@ html { } .content-aside a { - @apply text-darkblue underline; + @apply text-blue underline; @apply transition-colors duration-500; } .content-aside a:hover { - @apply text-yellow; + @apply text-blue-darker; } .content-aside > ul { diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index b106f77..46755da 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -12,12 +12,31 @@ {{- end -}} - {{ $cssFonts := resources.Get "css/fonts.css" }} - - - + + + + + {{ $cssTW := resources.Get "css/main.css" }} {{ $css := $cssTW | resources.PostCSS (dict "inlineImports" true) }} @@ -77,10 +96,10 @@
{{ partialCached "nav.html" . }} {{ block "main" . }} diff --git a/layouts/_default/index.html b/layouts/_default/home.html similarity index 85% rename from layouts/_default/index.html rename to layouts/_default/home.html index 3044214..818e5e4 100644 --- a/layouts/_default/index.html +++ b/layouts/_default/home.html @@ -2,13 +2,19 @@ {{ $wellClass := `mx-auto max-w-screen-md` }}

{{ .Title }}

-

+

A public service by - CT Mirror + Colordado News Collaborative

{{ .Content }} @@ -18,12 +24,12 @@

{{ partial "search.html" . }}

{{ $blkClass := `group relative block w-full sm:w-64 border border-g-5 rounded p-2 bg-white leading-tight shadow-md hover:shadow-lg duration-100 text-center` }} - {{ $svgWrapperClass := `text-g-5 group-hover:text-yellow` }} + {{ $svgWrapperClass := `text-g-5 group-hover:text-green` }} {{ $hedClass := `font-sans font-bold uppercase group-hover:text-blue duration-100` }} - {{ $dekClass := `my-1 mx-auto max-w-xs font-sans text-g-7 group-hover:text-darkblue duration-100` }} + {{ $dekClass := `my-1 mx-auto max-w-xs font-serif text-g-7` }} Areas of expertise {{ partial "pages-list.html" $expertise }}
-
+

Experts by location

{{ $loc := .GetPage "location" }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index a6832d5..bcd7b9e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -3,11 +3,13 @@

{{ with .Parent }} - Home + Home ยป {{ if ne . site.Home }} {{ .LinkTitle }} @@ -23,10 +25,10 @@

{{ $isOdd := false }} {{ range .Pages.ByParam "last" }} {{ $isOdd = not $isOdd }} -
  • +
  • {{ .LinkTitle }}

    diff --git a/layouts/_default/person.html b/layouts/_default/person.html index 349588c..80796e0 100644 --- a/layouts/_default/person.html +++ b/layouts/_default/person.html @@ -31,7 +31,7 @@

    {{ .Title }} @@ -63,7 +63,7 @@

    @@ -79,7 +79,7 @@

    {{ $url.Host }} {{ . }} @{{ . }} @{{ . }} {{ . }}Expertise

    {{ range $i, $p := . }} {{- if ne $i 0 }},{{ end }} {{ .Title -}} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index 50a9707..f6c70e1 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -5,7 +5,7 @@

    {{ with .Parent }} {{ if ne . site.Home }} {{ .LinkTitle }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 3aba8d5..812f111 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,7 +1,7 @@ -

    {{ range .menu }}
  • {{ .Name }} diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html index b440caa..5dac72b 100644 --- a/layouts/partials/nav.html +++ b/layouts/partials/nav.html @@ -1,4 +1,4 @@ -
    +