more upstreaming and using newer features

This commit is contained in:
Chris Cochrun 2023-12-16 06:05:33 -06:00
parent 9a2c3669e5
commit 0350d8586d
5 changed files with 122 additions and 198 deletions

View file

@ -1651,10 +1651,6 @@ select {
left: 0px;
}
.z-30 {
z-index: 30;
}
.z-10 {
z-index: 10;
}
@ -1667,6 +1663,10 @@ select {
z-index: 1;
}
.z-30 {
z-index: 30;
}
.order-first {
order: -9999;
}
@ -1728,11 +1728,6 @@ select {
margin-bottom: 0px;
}
.-my-2 {
margin-top: -0.5rem;
margin-bottom: -0.5rem;
}
.mx-auto {
margin-left: auto;
margin-right: auto;
@ -1758,6 +1753,11 @@ select {
margin-right: 3px;
}
.-my-2 {
margin-top: -0.5rem;
margin-bottom: -0.5rem;
}
.my-3 {
margin-top: 0.75rem;
margin-bottom: 0.75rem;
@ -1819,14 +1819,6 @@ select {
margin-right: 1rem;
}
.-mr-2 {
margin-right: -0.5rem;
}
.mb-1 {
margin-bottom: 0.25rem;
}
.mb-2 {
margin-bottom: 0.5rem;
}
@ -1855,6 +1847,10 @@ select {
margin-bottom: 1.25rem;
}
.mb-20 {
margin-bottom: 5rem;
}
.mr-3 {
margin-right: 0.75rem;
}
@ -1875,6 +1871,10 @@ select {
margin-bottom: 0px !important;
}
.mb-1 {
margin-bottom: 0.25rem;
}
.mb-16 {
margin-bottom: 4rem;
}
@ -1919,6 +1919,10 @@ select {
margin-left: 1.5rem;
}
.-mr-2 {
margin-right: -0.5rem;
}
.ml-auto {
margin-left: auto;
}
@ -1931,6 +1935,10 @@ select {
margin-bottom: 2px;
}
.mt-\[-2px\] {
margin-top: -2px;
}
.box-content {
box-sizing: content-box;
}
@ -2039,6 +2047,10 @@ select {
max-height: 5rem;
}
.max-h-3 {
max-height: 0.75rem;
}
.min-h-0 {
min-height: 0px;
}
@ -2063,14 +2075,14 @@ select {
width: 6rem;
}
.w-screen {
width: 100vw;
}
.w-36 {
width: 9rem;
}
.w-screen {
width: 100vw;
}
.w-8 {
width: 2rem;
}
@ -2127,10 +2139,6 @@ select {
max-width: 65ch;
}
.max-w-\[5rem\] {
max-width: 5rem;
}
.max-w-xl {
max-width: 36rem;
}
@ -2139,16 +2147,20 @@ select {
max-width: 1600px;
}
.max-w-3xl {
max-width: 48rem;
}
.max-w-fit {
max-width: -webkit-fit-content;
max-width: -moz-fit-content;
max-width: fit-content;
}
.max-w-3xl {
max-width: 48rem;
}
.max-w-\[5rem\] {
max-width: 5rem;
}
.max-w-\[64rem\] {
max-width: 64rem;
}
@ -2190,6 +2202,23 @@ select {
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
}
@-webkit-keyframes pulse {
50% {
opacity: .5;
}
}
@keyframes pulse {
50% {
opacity: .5;
}
}
.animate-pulse {
-webkit-animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
}
.cursor-default {
cursor: default;
}
@ -2262,6 +2291,12 @@ select {
margin-bottom: calc(2.5rem * var(--tw-space-y-reverse));
}
.space-y-3 > :not([hidden]) ~ :not([hidden]) {
--tw-space-y-reverse: 0;
margin-top: calc(0.75rem * calc(1 - var(--tw-space-y-reverse)));
margin-bottom: calc(0.75rem * var(--tw-space-y-reverse));
}
.space-x-3 > :not([hidden]) ~ :not([hidden]) {
--tw-space-x-reverse: 0;
margin-right: calc(0.75rem * var(--tw-space-x-reverse));
@ -2274,12 +2309,6 @@ select {
margin-left: calc(1.25rem * calc(1 - var(--tw-space-x-reverse)));
}
.space-y-3 > :not([hidden]) ~ :not([hidden]) {
--tw-space-y-reverse: 0;
margin-top: calc(0.75rem * calc(1 - var(--tw-space-y-reverse)));
margin-bottom: calc(0.75rem * var(--tw-space-y-reverse));
}
.space-y-2 > :not([hidden]) ~ :not([hidden]) {
--tw-space-y-reverse: 0;
margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse)));
@ -2446,10 +2475,6 @@ select {
background-color: rgba(var(--color-primary-600), var(--tw-bg-opacity));
}
.bg-neutral-100\/50 {
background-color: rgba(var(--color-neutral-100), 0.5);
}
.bg-neutral-500\/50 {
background-color: rgba(var(--color-neutral-500), 0.5);
}
@ -2478,6 +2503,10 @@ select {
background-color: rgba(var(--color-primary-500), var(--tw-bg-opacity));
}
.bg-neutral-100\/50 {
background-color: rgba(var(--color-neutral-100), 0.5);
}
.bg-gradient-to-t {
background-image: linear-gradient(to top, var(--tw-gradient-stops));
}
@ -2628,16 +2657,6 @@ select {
padding-bottom: 0.5rem;
}
.py-6 {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
}
.px-10 {
padding-left: 2.5rem;
padding-right: 2.5rem;
}
.py-16 {
padding-top: 4rem;
padding-bottom: 4rem;
@ -2668,6 +2687,11 @@ select {
padding-right: 0.5rem;
}
.py-6 {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
}
.py-4 {
padding-top: 1rem;
padding-bottom: 1rem;
@ -2730,6 +2754,10 @@ select {
padding-right: 24px;
}
.text-left {
text-align: left;
}
.text-center {
text-align: center;
}
@ -2746,6 +2774,10 @@ select {
vertical-align: top;
}
.align-middle {
vertical-align: middle;
}
.align-text-bottom {
vertical-align: text-bottom;
}
@ -2788,11 +2820,6 @@ select {
line-height: 1rem;
}
.text-3xl {
font-size: 1.875rem;
line-height: 2.25rem;
}
.text-2xl {
font-size: 1.5rem;
line-height: 2rem;
@ -2814,14 +2841,14 @@ select {
font-weight: 600;
}
.font-medium {
font-weight: 500;
}
.font-normal {
font-weight: 400;
}
.font-medium {
font-weight: 500;
}
.font-light {
font-weight: 300;
}
@ -2838,10 +2865,6 @@ select {
line-height: 1.75rem;
}
.leading-loose {
line-height: 2;
}
.leading-6 {
line-height: 1.5rem;
}
@ -2935,6 +2958,10 @@ select {
color: rgba(var(--color-primary-800), var(--tw-text-opacity));
}
.text-transparent {
color: transparent;
}
.\!no-underline {
text-decoration-line: none !important;
}
@ -2943,10 +2970,6 @@ select {
text-decoration-color: rgba(var(--color-primary-500), 1);
}
.decoration-secondary-500 {
text-decoration-color: rgba(var(--color-secondary-500), 1);
}
.decoration-neutral-300 {
text-decoration-color: rgba(var(--color-neutral-300), 1);
}
@ -2961,14 +2984,14 @@ select {
color: rgba(var(--color-neutral-300), var(--tw-placeholder-opacity));
}
.opacity-0 {
opacity: 0;
}
.opacity-50 {
opacity: 0.5;
}
.opacity-0 {
opacity: 0;
}
.opacity-60 {
opacity: 0.6;
}
@ -3719,6 +3742,10 @@ body:has(#menu-controller:checked) {
/* Custom */
pre {
text-align: left;
}
.thumbnail {
min-width: 300px;
height: 180px;
@ -3781,7 +3808,7 @@ body:has(#menu-controller:checked) {
.anchor {
display: block;
position: relative;
top: -100px;
top: -150px;
height: 0px;
visibility: hidden;
}
@ -4891,10 +4918,6 @@ body:has(#menu-controller:checked) {
margin-left: 0.5rem;
}
[dir="ltr"] .ltr\:mr-14 {
margin-right: 3.5rem;
}
[dir="ltr"] .ltr\:mr-4 {
margin-right: 1rem;
}
@ -4903,6 +4926,10 @@ body:has(#menu-controller:checked) {
margin-left: -1.25rem;
}
[dir="ltr"] .ltr\:mr-14 {
margin-right: 3.5rem;
}
[dir="ltr"] .ltr\:block {
display: block;
}
@ -4947,10 +4974,6 @@ body:has(#menu-controller:checked) {
margin-right: 0.5rem;
}
[dir="rtl"] .rtl\:ml-14 {
margin-left: 3.5rem;
}
[dir="rtl"] .rtl\:ml-4 {
margin-left: 1rem;
}
@ -4959,6 +4982,10 @@ body:has(#menu-controller:checked) {
margin-right: -1.25rem;
}
[dir="rtl"] .rtl\:ml-14 {
margin-left: 3.5rem;
}
[dir="rtl"] .rtl\:block {
display: block;
}
@ -5049,15 +5076,15 @@ body:has(#menu-controller:checked) {
background-color: rgba(var(--color-primary-800), var(--tw-bg-opacity));
}
.dark .dark\:bg-neutral-900\/50 {
background-color: rgba(var(--color-neutral-900), 0.5);
}
.dark .dark\:bg-primary-400 {
--tw-bg-opacity: 1;
background-color: rgba(var(--color-primary-400), var(--tw-bg-opacity));
}
.dark .dark\:bg-neutral-900\/50 {
background-color: rgba(var(--color-neutral-900), 0.5);
}
.dark .dark\:bg-neutral-700 {
--tw-bg-opacity: 1;
background-color: rgba(var(--color-neutral-700), var(--tw-bg-opacity));
@ -5073,6 +5100,11 @@ body:has(#menu-controller:checked) {
background-color: rgba(var(--color-primary-300), var(--tw-bg-opacity));
}
.dark .dark\:bg-neutral-400 {
--tw-bg-opacity: 1;
background-color: rgba(var(--color-neutral-400), var(--tw-bg-opacity));
}
.dark .dark\:from-neutral-800 {
--tw-gradient-from: rgba(var(--color-neutral-800), 1);
--tw-gradient-to: rgba(var(--color-neutral-800), 0);
@ -5296,20 +5328,11 @@ body:has(#menu-controller:checked) {
padding-right: 1.5rem;
}
.sm\:py-10 {
padding-top: 2.5rem;
padding-bottom: 2.5rem;
}
.sm\:py-24 {
padding-top: 6rem;
padding-bottom: 6rem;
}
.sm\:pt-10 {
padding-top: 2.5rem;
}
.sm\:pl-6 {
padding-left: 1.5rem;
}
@ -5345,14 +5368,14 @@ body:has(#menu-controller:checked) {
margin-top: 0px;
}
.md\:ml-12 {
margin-left: 3rem;
}
.md\:-mr-16 {
margin-right: -4rem;
}
.md\:ml-12 {
margin-left: 3rem;
}
.md\:flex {
display: flex;
}

View file

@ -2,6 +2,7 @@ colorScheme: blowfish
defaultAppearance: dark
autoSwitchAppearance: false
enableSearch: true
highlightCurrentMenuArea: true
smartTOC: true
logo: logo.png
author:

View file

@ -28,8 +28,8 @@ weight: 70
Chris and Abbie Cochrun serve together on TFC Staff! Chris grew up in Agra KS as a part of the Eastern Heights TFC group, Abbie grew up as a part of the Northern Valley TFC group and they got to know each other through TFC! Chris handles a lot of IT and video related things for TFC and Abbie is TFCs graphic designer.
Subscribe to our newsletters!
- [{{< icon "email" >}} Email](http://eepurl.com/dPuMqz)
- [{{< icon "rss" >}} RSS](index.xml)
- [{{< icon "email" >}} Email](http://eepurl.com/dPuMqz)
- [{{< icon "rss" >}} RSS](index.xml)
<!-- You can check out my own website at [cochrun.xyz](https://cochrun.xyz)! -->

View file

@ -1,59 +0,0 @@
<!DOCTYPE html>
<html
lang="{{ with .Site.Params.isoCode | default (.Site.LanguageCode | default "en") }}
{{- . -}}
{{ end }}"
dir="{{ if .Site.Params.rtl | default false -}}
rtl
{{- else -}}
ltr
{{- end }}"
class="scroll-smooth"
data-default-appearance="{{ .Site.Params.defaultAppearance | default "light" }}"
data-auto-appearance="{{ .Site.Params.autoSwitchAppearance | default "true" }}"
>
{{- partial "head.html" . -}}
<body
class="flex flex-col h-screen px-6 m-auto text-lg leading-7 max-w-7xl bg-neutral text-neutral-900 dark:bg-neutral-800 dark:text-neutral sm:px-14 md:px-24 lg:px-32"
>
<div id="the-top" class="absolute flex self-center">
<a
class="px-3 py-1 text-sm -translate-y-8 rounded-b-lg bg-primary-200 focus:translate-y-0 dark:bg-neutral-600"
href="#main-content"
><span class="font-bold text-primary-600 ltr:pr-2 rtl:pl-2 dark:text-primary-400"
>&darr;</span
>{{ i18n "nav.skip_to_main" }}</a
>
</div>
{{ $header := print "partials/header/" .Site.Params.header.layout ".html" }}
{{ if templates.Exists $header }}
{{ partial $header . }}
{{ else }}
{{ partial "partials/header/basic.html" . }}
{{ end }}
<div class="relative flex flex-col grow">
<main id="main-content" class="grow">
{{ block "main" . }}{{ end }}
{{ if (.Site.Params.footer.showScrollToTop | default true) }}
<div
class="pointer-events-none absolute top-[100vh] bottom-0 w-12 ltr:right-0 rtl:left-0"
>
<a
href="#the-top"
class="pointer-events-auto sticky top-[calc(100vh-5.5rem)] flex h-12 w-12 items-center justify-center rounded-full bg-neutral/50 text-xl text-neutral-700 backdrop-blur hover:text-primary-600 dark:bg-neutral-800/50 dark:text-neutral dark:hover:text-primary-400"
aria-label="{{ i18n "nav.scroll_to_top_title" }}"
title="{{ i18n "nav.scroll_to_top_title" }}"
>
&uarr;
</a>
</div>
{{ end }}
</main>
{{- partial "footer.html" . -}}
{{ if .Site.Params.enableSearch | default false }}
{{- partial "search.html" . -}}
{{ end }}
{{- partial "leaflet-loader" . -}}
</div>
</body>
</html>

View file

@ -1,41 +0,0 @@
{{ define "main" }}
{{ $toc := and (.Params.showTableOfContents | default (.Site.Params.list.showTableOfContents | default false)) (in .TableOfContents "<ul") }}
<header>
{{ if .Params.showBreadcrumbs | default (.Site.Params.list.showBreadcrumbs | default false) }}
{{ partial "breadcrumbs.html" . }}
{{ end }}
<h1 class="mt-0 text-4xl font-extrabold text-neutral-900 dark:text-neutral">{{ .Title }}</h1>
</header>
<section
class="{{ if $toc -}}
mt-12
{{- else -}}
mt-0
{{- end }} prose flex max-w-full flex-col dark:prose-invert lg:flex-row"
>
{{ if $toc }}
<div class="order-first px-0 lg:order-last lg:max-w-xs ltr:lg:pl-8 rtl:lg:pr-8">
<div class="toc ltr:pl-5 rtl:pr-5 lg:sticky lg:top-10">
{{ partial "toc.html" . }}
</div>
</div>
{{ end }}
<div class="min-w-0 min-h-0 max-w-prose">
{{ .Content | emojify }}
</div>
</section>
{{ if gt .Pages 0 }}
<section class="space-y-10 w-full">
{{ range .Pages }}
{{ partial "article-link.html" . }}
{{ end }}
</section>
{{ partial "pagination.html" . }}
{{ else }}
<section class="mt-10 prose dark:prose-invert">
<p class="py-8 border-t">
<em>{{ i18n "list.no_articles" | emojify }}</em>
</p>
</section>
{{ end }}
{{ end }}