diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index cf1985df..71573ecd 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -245,6 +245,7 @@ body.zen-mode-enable { --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --spacing: 0.25rem; + --container-2xs: 18rem; --container-xs: 20rem; --container-xl: 36rem; --container-3xl: 48rem; @@ -656,6 +657,9 @@ body.zen-mode-enable { .me-4 { margin-inline-end: calc(var(--spacing) * 4); } + .me-6 { + margin-inline-end: calc(var(--spacing) * 6); + } .prose { color: var(--tw-prose-body); max-width: 65ch; @@ -1147,9 +1151,6 @@ body.zen-mode-enable { .mt-20 { margin-top: calc(var(--spacing) * 20); } - .mt-\[0\.1rem\] { - margin-top: 0.1rem; - } .mt-\[0\.5rem\] { margin-top: 0.5rem; } @@ -1171,9 +1172,6 @@ body.zen-mode-enable { .mr-5 { margin-right: calc(var(--spacing) * 5); } - .mr-auto { - margin-right: auto; - } .\!mb-0 { margin-bottom: calc(var(--spacing) * 0) !important; } @@ -1222,12 +1220,6 @@ body.zen-mode-enable { .ml-2 { margin-left: calc(var(--spacing) * 2); } - .ml-3 { - margin-left: calc(var(--spacing) * 3); - } - .ml-auto { - margin-left: auto; - } .box-border { box-sizing: border-box; } @@ -1455,9 +1447,6 @@ body.zen-mode-enable { .max-w-\[5rem\] { max-width: 5rem; } - .max-w-\[64rem\] { - max-width: 64rem; - } .max-w-\[200px\] { max-width: 200px; } @@ -1983,9 +1972,6 @@ body.zen-mode-enable { .p-1\.5 { padding: calc(var(--spacing) * 1.5); } - .p-2\.5 { - padding: calc(var(--spacing) * 2.5); - } .p-4 { padding: calc(var(--spacing) * 4); } @@ -2091,18 +2077,12 @@ body.zen-mode-enable { .pt-\[5px\] { padding-top: 5px; } - .pr-0 { - padding-right: calc(var(--spacing) * 0); + .pr-2 { + padding-right: calc(var(--spacing) * 2); } .pr-8 { padding-right: calc(var(--spacing) * 8); } - .pr-\[24px\] { - padding-right: 24px; - } - .pb-0 { - padding-bottom: calc(var(--spacing) * 0); - } .pb-2 { padding-bottom: calc(var(--spacing) * 2); } @@ -2124,12 +2104,6 @@ body.zen-mode-enable { .pl-0 { padding-left: calc(var(--spacing) * 0); } - .pl-4 { - padding-left: calc(var(--spacing) * 4); - } - .pl-\[24px\] { - padding-left: 24px; - } .text-center { text-align: center; } @@ -2533,27 +2507,6 @@ body.zen-mode-enable { } } } - .group-hover\:text-primary-600 { - &:is(:where(.group):hover *) { - @media (hover: hover) { - color: rgba(var(--color-primary-600), 1); - } - } - } - .group-hover\:underline { - &:is(:where(.group):hover *) { - @media (hover: hover) { - text-decoration-line: underline; - } - } - } - .group-hover\:decoration-primary-500 { - &:is(:where(.group):hover *) { - @media (hover: hover) { - text-decoration-color: rgba(var(--color-primary-500), 1); - } - } - } .group-hover\:opacity-100 { &:is(:where(.group):hover *) { @media (hover: hover) { @@ -3049,6 +3002,11 @@ body.zen-mode-enable { padding-inline: calc(var(--spacing) * 24); } } + .md\:pr-4 { + @media (width >= 853px) { + padding-right: calc(var(--spacing) * 4); + } + } .lg\:absolute { @media (width >= 1024px) { position: absolute; @@ -3139,6 +3097,11 @@ body.zen-mode-enable { width: auto; } } + .lg\:max-w-2xs { + @media (width >= 1024px) { + max-width: var(--container-2xs); + } + } .lg\:max-w-7xl { @media (width >= 1024px) { max-width: var(--container-7xl); @@ -3224,11 +3187,6 @@ body.zen-mode-enable { grid-template-columns: repeat(5, minmax(0, 1fr)); } } - .ltr\:mr-4 { - &:where(:dir(ltr), [dir="ltr"], [dir="ltr"] *) { - margin-right: calc(var(--spacing) * 4); - } - } .ltr\:-ml-12 { &:where(:dir(ltr), [dir="ltr"], [dir="ltr"] *) { margin-left: calc(var(--spacing) * -12); @@ -3244,21 +3202,11 @@ body.zen-mode-enable { display: none; } } - .ltr\:inline { - &:where(:dir(ltr), [dir="ltr"], [dir="ltr"] *) { - display: inline; - } - } .rtl\:-mr-\[79px\] { &:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) { margin-right: calc(79px * -1); } } - .rtl\:ml-4 { - &:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) { - margin-left: calc(var(--spacing) * 4); - } - } .rtl\:block { &:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) { display: block; @@ -3269,9 +3217,9 @@ body.zen-mode-enable { display: none; } } - .rtl\:inline { + .rtl\:rotate-180 { &:where(:dir(rtl), [dir="rtl"], [dir="rtl"] *) { - display: inline; + rotate: 180deg; } } .dark\:flex { @@ -3517,15 +3465,6 @@ body.zen-mode-enable { } } } - .dark\:group-hover\:text-primary-400 { - &:is(.dark *) { - &:is(:where(.group):hover *) { - @media (hover: hover) { - color: rgba(var(--color-primary-400), 1); - } - } - } - } .dark\:hover\:\!bg-primary-700 { &:is(.dark *) { &:hover { @@ -3657,11 +3596,6 @@ button, [role="button"] { .prose div.min-w-0.max-w-prose > *:first-child { margin-top: calc(var(--spacing) * 3); } -#TableOfContents { - @media (width >= 1024px) { - max-width: 25vw; - } -} #TOCView { max-height: calc(100vh - 150px); min-height: 0; @@ -3746,8 +3680,8 @@ button, [role="button"] { overflow: auto hidden; } .katex-display { - padding-right: 2px; - width: calc(100% - 2px); + padding: 1em; + width: calc(100% - 1em); } table { display: block; @@ -3773,6 +3707,7 @@ pre { object-fit: cover; } .single_hero_background { + width: calc(100% + 1px); z-index: -10; } .hero_gradient { diff --git a/assets/css/main.css b/assets/css/main.css index 577c60ec..4c13445f 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -66,10 +66,6 @@ button, } /* Table of Contents */ -#TableOfContents { - @apply lg:max-w-[25vw]; -} - #TOCView { max-height: calc(100vh - 150px); min-height: 0; @@ -130,8 +126,8 @@ button, /* Fix katex overflow https://github.com/nunocoracao/blowfish/issues/2138 */ .katex-display { - padding-right: 2px; - width: calc(100% - 2px); + padding: 1em; + width: calc(100% - 1em); } /* Fix long tables breaking out of article on mobile */ @@ -169,6 +165,7 @@ pre { } .single_hero_background { + width: calc(100% + 1px); /* patch for very small gap at right edge on mobile devices */ z-index: -10; } diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index b9d7d40a..b09cfe90 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -8,9 +8,10 @@ {{- partial "head.html" . -}} {{- partialCached "init.html" . -}} - - + {{ $bodyLayout := "flex flex-col h-screen m-auto leading-7 max-w-7xl px-6 sm:px-14 md:px-24 lg:px-32" }} + {{ $bodyColor := "text-lg bg-neutral text-neutral-900 dark:bg-neutral-800 dark:text-neutral" }} + {{ $bodyScrollbar := "scrollbar-thin scrollbar-track-neutral-200 scrollbar-thumb-neutral-400 dark:scrollbar-track-neutral-800 dark:scrollbar-thumb-neutral-600" }} +
- {{ $enableToc := .Params.showTableOfContents | default (site.Params.list.showTableOfContents | default false) }} + {{ $enableToc := site.Params.article.showTableOfContents | default false }} + {{ $enableToc = .Params.showTableOfContents | default $enableToc }} {{ $showToc := and $enableToc (in .TableOfContents " + {{ if $showToc }} +
{{ if $showToc }} {{ partial "toc.html" . }} {{ end }} - {{ if $showRelated }} - sd - {{ end }}
{{ end }} diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html index a6e54935..94851574 100644 --- a/layouts/_default/terms.html +++ b/layouts/_default/terms.html @@ -1,6 +1,6 @@ {{ define "main" }} {{ .Scratch.Set "scope" "list" }} - {{ $showHero := .Params.showHero | default site.Params.term.showHero | default false }} + {{ $showHero := .Params.showHero | default site.Params.taxonomy.showHero | default false }} {{ if $showHero }} {{ $heroStyle := print "hero/" site.Params.taxonomy.heroStyle ".html" }} {{ if templates.Exists ( printf "partials/%s" $heroStyle ) }} diff --git a/layouts/partials/article-link/_shortcode.html b/layouts/partials/article-link/_shortcode.html index c7839e25..9b53b9a8 100644 --- a/layouts/partials/article-link/_shortcode.html +++ b/layouts/partials/article-link/_shortcode.html @@ -20,7 +20,7 @@ {{ if site.Params.list.showCards }} {{ $cardClasses = printf "%s overflow-hidden rounded-md border-2 border-neutral-200 dark:border-neutral-700" $cardClasses }} {{ $figureClasses = "" }} - {{ $cardContentClasses = printf "%s p-2.5 pl-4 pb-0" $cardContentClasses }} + {{ $cardContentClasses = printf "%s p-4 pt-2" $cardContentClasses }} {{ else }} {{ $cardClasses = printf "%s" $cardClasses }} {{ $figureClasses = printf "%s thumbnail-shadow md:mr-7" $figureClasses }} diff --git a/layouts/partials/article-pagination.html b/layouts/partials/article-pagination.html index ca2de281..d0d6bd64 100644 --- a/layouts/partials/article-pagination.html +++ b/layouts/partials/article-pagination.html @@ -9,52 +9,36 @@
- + {{ if $prev }} - - ← - → - - {{ $prev.Title | emojify }} - - {{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }} - {{ partial "meta/date.html" $prev.Date }} - {{ end }} - + + + ← {{ $prev.Title | emojify }} + {{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }} + + {{ partial "meta/date.html" $prev.Date }} + + {{ end }} {{ end }} - + {{ if $next }} - - - {{ $next.Title | emojify }} - - {{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }} - {{ partial "meta/date.html" $next.Date }} - {{ end }} - + + + {{ $next.Title | emojify }} → - → - ← + {{ if .Params.showDate | default (.Site.Params.article.showDate | default true) }} + + {{ partial "meta/date.html" $next.Date }} + + {{ end }} {{ end }}
diff --git a/layouts/partials/author-extra.html b/layouts/partials/author-extra.html index fd18a385..de97e797 100644 --- a/layouts/partials/author-extra.html +++ b/layouts/partials/author-extra.html @@ -8,14 +8,16 @@ {{ $authorImage = resources.Get . }} {{ end }} {{ if $authorImage }} + {{ $final := $authorImage }} {{ if not $disableImageOptimization }} - {{ $authorImage = $authorImage.Fill "192x192" }} + {{ $final = $authorImage.Fill "192x192" }} {{ end }} + src="{{ $final.RelPermalink }}" + data-zoom-src="{{ $authorImage.RelPermalink }}"> {{ end }} {{ end }}
diff --git a/layouts/partials/author.html b/layouts/partials/author.html index 50d2f54c..57d8088c 100644 --- a/layouts/partials/author.html +++ b/layouts/partials/author.html @@ -8,26 +8,30 @@ {{ $authorImage = resources.Get . }} {{ end }} {{ if $authorImage }} + {{ $final := $authorImage }} {{ if not $disableImageOptimization }} - {{ $authorImage = $authorImage.Fill "192x192" }} + {{ $final = $authorImage.Fill "192x192" }} {{ end }} {{ $.Site.Params.Author.name | default + src="{{ $final.RelPermalink }}" + data-zoom-src="{{ $authorImage.RelPermalink }}"> {{ else }} {{ $authorImage := resources.GetRemote . }} + {{ $final := $authorImage }} {{ if not $disableImageOptimization }} - {{ $authorImage = $authorImage.Fill "192x192" }} + {{ $final = $authorImage.Fill "192x192" }} {{ end }} {{ $.Site.Params.Author.name | default + src="{{ $authorImage.RelPermalink }}" + data-zoom-src="{{ $authorImage.RelPermalink }}"> {{ end }} {{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 45333f5e..752e86bd 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -11,7 +11,7 @@ {{ end }} {{ $navClass := printf "flex flex-row pb-4 text-base font-medium text-neutral-500 dark:text-neutral-400 %s" (cond $onlyIcon "overflow-x-auto py-2" "") }} {{ $ulClass := printf "flex list-none %s" (cond $onlyIcon "flex-row" "flex-col sm:flex-row") }} - {{ $liClass := printf "flex mb-1 text-end sm:mb-0 sm:me-7 sm:last:me-0 %s" (cond $onlyIcon "ltr:mr-4 rtl:ml-4" "") }} + {{ $liClass := printf "flex mb-1 text-end sm:mb-0 sm:me-7 sm:last:me-0 %s" (cond $onlyIcon "me-4" "") }}
@@ -68,7 +68,7 @@ {{ end }} {{/* Mobile navigation */}} -{{ define "HeaderMobileNavigation" }} +{{ define "HeaderMobileToolbar" }}
@@ -104,7 +104,7 @@
{{ end }} -{{ define "HeaderMobileMenu" }} +{{ define "HeaderMobileNavigation" }}