Re-enable syntax highlighting in light mode

Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>
style: Fix inconsistent indentation in SCSS files for clarity
2025-04-12 17:56:03 -07:00 · 2025-04-05 19:54:25 -07:00 · 2025-03-30 23:11:35 -07:00 · 2025-03-30 22:45:24 -07:00 · 2025-03-02 18:59:45 -08:00 · 2025-03-02 13:39:41 -08:00
18 changed files with 257 additions and 257 deletions
--- a/assets/scss/code.scss
+++ b/assets/scss/code.scss
@@ -104,12 +104,10 @@ pre code {
 }

 .kr, .kd, .k {
-    font-weight: bold;
    @include var(color, code-keyword-color);
 }

 .kt {
-    font-weight: bold;
    @include var(color, code-type-color);
 }

--- a/assets/scss/fonts.scss
+++ b/assets/scss/fonts.scss
@@ -39,7 +39,6 @@
 }

@include font-inconsolata(400);
-@include font-inconsolata(700);
@include font-lora();
@include font-raleway(400);
@include font-raleway(700);
--- a/assets/scss/style.scss
+++ b/assets/scss/style.scss
@@ -247,7 +247,7 @@ ul.post-list {

    p.post-wordcount, p.post-status {
        text-align: center;
-        margin-bottom: 0.6rem;
+        margin-bottom: 1rem;
    }

    .series-link {
@@ -330,8 +330,7 @@ figure {
 That's because firefox reader mode doesn't play nice with them, and
 it seems to ignore all styles in <head>. Then, the inline style
 in <head> uses !important to restore the display of icons, but provides
- limited styling. Here, we finally apply the full extent of the feather
- styles.
+ limited styling. Here, we finally apply the full extent of the feather styles.
 */
 .feather {
    width: 1rem;
@@ -402,7 +401,6 @@ figure {
        }
    }

-
    a, .ongoing-placeholder {
        @include bordered-block;
        padding: 0.5em 1em 0.5em 1em;
--- a/assets/scss/variables.scss
+++ b/assets/scss/variables.scss
@@ -23,7 +23,7 @@ $target-background-color-dark: #55511c;

 $code-color: #f0f0f0;
 $code-color-dark: lighten($background-color-dark, 10%);
-$code-token-color: black;
+$code-token-color: darken($primary-color, 25%);
 $code-token-color-dark: $primary-color;
 $code-highlight-color: #fffd99;
 $code-highlight-color-dark: #555538;
--- a/chatgpt-instance-fonts.py
+++ b/chatgpt-instance-fonts.py
@@ -30,11 +30,6 @@ def main():
        {"wght": 400},
        "Inconsolata-400.woff2"
    )
-    instantiate_variable_font(
-        "Inconsolata-VariableFont_wdth,wght.ttf",
-        {"wght": 700},
-        "Inconsolata-700.woff2"
-    )

    # Lora (Variable, normal and italic)
    instantiate_variable_font(
--- a/layouts/_default/_markup/render-blockquote.html
+++ b/layouts/_default/_markup/render-blockquote.html
@@ -0,0 +1,9 @@
+{{ if and (eq .Type "alert") (eq .AlertType "todo") -}}
+<div style="background-color: tomato; color: white; padding: 10px;">
+    <em>TODO: </em>{{- .Text | plainify -}}
+</div>
+{{- else -}}
+<blockquote {{- with .Attributes.id }} id="{{ . }}"{{ end }}>
+{{ .Text -}}
+</blockquote>
+{{- end }}
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -1,24 +1,25 @@
-{{- $scratch := newScratch -}}
+{{- $class := "" -}}
+{{- $icon := "" -}}
 {{- $absoluteDest := absLangURL .Destination -}}
 {{- $siteRootUrl := absLangURL "" -}}
 {{- $isExternal := not (hasPrefix $absoluteDest $siteRootUrl) -}}
 {{- $isSamePage := hasPrefix .Destination "#" -}}

 {{- if $isSamePage -}}
-  {{- $scratch.Set "class" "same-page-link" -}}
+  {{- $class = "same-page-link" -}}
  {{- if index (.Page.Scratch.Get "definedSections") .Destination -}}
-    {{- $scratch.Set "icon" "arrow-up" -}}
+    {{- $icon = "arrow-up" -}}
  {{- else -}}
    {{- /* Do not render "down" links because don't know how to distinguish unseen titles from paragraph links. */ -}}
-    {{- /* $scratch.Set "icon" "arrow-down" */ -}}
+    {{- /* $icon = "arrow-down" */ -}}
  {{- end -}}
 {{- else if $isExternal -}}
-  {{- $scratch.Set "class" "external-link" -}}
-  {{- $scratch.Set "icon" "external-link" -}}
+  {{- $class = "external-link" -}}
+  {{- $icon = "external-link" -}}
 {{- end -}}
 <a href="{{ .Destination | safeURL }}"
  {{- with .Title }} title="{{ . }}"{{ end -}}
-  {{- with $scratch.Get "class" -}}
+  {{- with $class -}}
    class="{{ . }}"
  {{- end -}}
  {{- if (and site.Params.externalLinksInNewTab $isExternal) -}}
@@ -26,6 +27,6 @@
  {{- end -}}
 >
  {{- with .Text | safeHTML }}{{ . }}{{ end -}}
-  {{- with $scratch.Get "icon" -}}{{- partial "icon.html" . -}}{{- end -}}
+  {{- with $icon -}}{{- partial "icon.html" . -}}{{- end -}}
 </a>
 {{- /* chomp trailing newline */ -}}
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -15,7 +15,7 @@

    <!-- Fonts -->
    {{ if not (.Site.Params.noCss) }}
-    {{ $fonts := resources.Get "scss/fonts.scss" | resources.ToCSS | resources.Minify }}
+    {{ $fonts := resources.Get "scss/fonts.scss" | css.Sass | resources.Minify }}
    <link rel="stylesheet" href="{{ $fonts.Permalink }}" media="screen">
    {{ end }}

@@ -31,9 +31,9 @@
    {{ end -}}

    <!-- In-house CSS -->
-    {{ $style := resources.Get "scss/style.scss" | resources.ToCSS | resources.Minify }}
-    {{ $sidenotes := resources.Get "scss/sidenotes.scss" | resources.ToCSS | resources.Minify }}
-    {{ $code := resources.Get "scss/code.scss" | resources.ToCSS | resources.Minify }}
+    {{ $style := resources.Get "scss/style.scss" | css.Sass | resources.Minify }}
+    {{ $sidenotes := resources.Get "scss/sidenotes.scss" | css.Sass | resources.Minify }}
+    {{ $code := resources.Get "scss/code.scss" | css.Sass | resources.Minify }}
    {{ $icon := resources.Get "img/favicon.png" }}
    <style>.feather { display: inline !important; width: 10px; height: 10px; }</style>
    <style>img { max-width: 70%; }</style>
@@ -66,7 +66,7 @@
    <script defer src="{{ .Site.Params.bergamotObjectLanguageJsUrl }}"></script>
    {{ $bergamotHelpers := resources.Get "js/bergamot-helpers.js" | resources.Minify }}
    <script defer src="{{ $bergamotHelpers.Permalink }}"></script>
-    {{ $bergamotStyle := resources.Get "scss/bergamot.scss" | resources.ToCSS | resources.Minify }}
+    {{ $bergamotStyle := resources.Get "scss/bergamot.scss" | css.Sass | resources.Minify }}
    {{ partial "defercss.html" (dict "url" $bergamotStyle.Permalink "extra" "") }}
    {{ if .Params.bergamot.render_presets }}
        {{ range $name, $rulefile := .Params.bergamot.render_presets }}
--- a/layouts/partials/highlightgroup.html
+++ b/layouts/partials/highlightgroup.html
@@ -1,12 +1,11 @@
-{{- $scratch := newScratch -}}
-{{- $scratch.Set "highlightGroupAttrs" (printf "data-base-path=\"%s\" data-file-path=\"%v\"" .basePath .path) -}}
+{{- $highlightGroupAttrs := (printf "data-base-path=\"%s\" data-file-path=\"%v\"" .basePath .path) -}}
 {{- if (or .firstLine .lastLine) -}}
-{{- $scratch.Add "highlightGroupAttrs" (printf " data-first-line=\"%v\" data-last-line=\"%v\"" .firstLine .lastLine) -}}
+{{- $highlightGroupAttrs = add $highlightGroupAttrs (printf " data-first-line=\"%v\" data-last-line=\"%v\"" .firstLine .lastLine) -}}
 {{- end -}}
 {{- if eq (lower .language) "agda" -}}
-{{- $scratch.Add "highlightGroupAttrs" " data-agda-block" -}}
+{{- $highlightGroupAttrs = add $highlightGroupAttrs " data-agda-block" -}}
 {{- end -}}
 {{- with .offset -}}
-{{- $scratch.Add "highlightGroupAttrs" (printf " data-source-offset=\"%v\"" .) -}}
+{{- $highlightGroupAttrs = add $highlightGroupAttrs (printf " data-source-offset=\"%v\"" .) -}}
 {{- end -}}
-{{ partial "group.html" (dict "url" .url "path" .path "comment" .comment "content" (highlight .code .language .opts) "attrs" ($scratch.Get "highlightGroupAttrs")) }}
+{{ partial "group.html" (dict "url" .url "path" .path "comment" .comment "content" (highlight .code .language .opts) "attrs" $highlightGroupAttrs) }}
--- a/layouts/partials/post.html
+++ b/layouts/partials/post.html
@@ -14,7 +14,7 @@
    {{ partial "seriesstatus.html" .page.Params.status }}
    </p>
    {{ end }}
-    <p class="post-preview">{{ .page.Summary }} {{ if .page.Truncated }}...{{ end }}</p>
+    <p class="post-preview">{{ partial "summary" .page }}</p>
    {{- if .linkSeries -}}
    {{- $term := index (.page.GetTerms "series") 0 -}}
    {{- with $term -}}
--- a/layouts/partials/summary.html
+++ b/layouts/partials/summary.html
@@ -0,0 +1,5 @@
+{{- if .Params.summary -}}
+{{ .Params.summary }}
+{{- else -}}
+{{ .Summary | plainify | truncate 180 }}
+{{- end -}}
--- a/layouts/search/single.html
+++ b/layouts/search/single.html
@@ -2,7 +2,7 @@
 <h2>{{ .Title }} </h2>
 {{ .Content }}

-{{ $search := resources.Get "scss/search.scss" | resources.ToCSS | resources.Minify }}
+{{ $search := resources.Get "scss/search.scss" | css.Sass | resources.Minify }}
 <link rel="stylesheet" href="{{ $search.Permalink }}" media="screen">

 <div class="stork-wrapper">
--- a/layouts/series/list.html
+++ b/layouts/series/list.html
@@ -7,7 +7,7 @@
    <p>{{ partial "seriesstatus.html" .Params.status }}</p>
    <p>{{ i18n "postsFromTo" (dict "from" $startYear "to" $endYear) }}</p>
 </div>
-<p>{{ .Summary }}</p>
+<p>{{ partial "summary" . }}</p>

 <ul class="post-list">
    {{ range $pages }}
--- a/layouts/shortcodes/codelines.html
+++ b/layouts/shortcodes/codelines.html
@@ -1,39 +1,38 @@
 {{- $source := (readFile (printf "code/%s" (.Get 1))) -}}
 {{- $allLines := split $source "\n" -}}
 {{- $scratch := newScratch -}}
+{{- $remLines := $allLines -}}
 {{- if not (eq (int (.Get 2)) 1) -}}
-{{- $scratch.Set "remLines" (after (sub (int (.Get 2)) 1) $allLines) -}}
-{{- else -}}
-{{- $scratch.Set "remLines" $allLines -}}
+{{- $remLines = after (sub (int (.Get 2)) 1) $allLines -}}
 {{- end -}}
-{{- $lines := first (add (sub (int (.Get 3)) (int (.Get 2))) 1) ($scratch.Get "remLines") -}}
+{{- $lines := first (add (sub (int (.Get 3)) (int (.Get 2))) 1) $remLines -}}

+{{- $opts := "" -}}
 {{- if (.Get 4) -}}
-{{- $scratch.Set "opts" (printf ",%s" (.Get 4)) -}}
-{{- else -}}
-{{- $scratch.Set "opts" "" -}}
+{{- $opts = printf ",%s" (.Get 4) -}}
 {{- end -}}

 {{- if (.Get 5) -}}
 {{- $scratch.Set "hidden" (.Get 5) -}}
 {{- end -}}

+{{- $prefixLength := "" -}}
+{{- $joinedLines := "" -}}
 {{- if or (.Page.Params.left_align_code) (.Get 6) -}}
-{{- $scratch.Set "prefixLength" -1 -}}
+{{- $prefixLength = -1 -}}
 {{- range $line := $lines -}}
 {{- $leading := sub (len $line) (len (strings.TrimLeft " " $line)) -}}
-{{- if and (ne $line "") (or (eq ($scratch.Get "prefixLength") -1) (le $leading ($scratch.Get "prefixLength"))) -}}
-{{- $scratch.Set "prefixLength" $leading -}}
+{{- if and (ne $line "") (or (eq $prefixLength -1) (le $leading $prefixLength)) -}}
+{{- $prefixLength = $leading -}}
 {{- end -}}
 {{- end -}}

-{{- $scratch.Set "joinedLines" "" -}}
 {{- range $line := $lines -}}
-{{- $scratch.Add "joinedLines" (substr $line ($scratch.Get "prefixLength")) -}}
-{{- $scratch.Add "joinedLines" "\n" -}}
+{{- $joinedLines = add $joinedLines (substr $line $prefixLength) -}}
+{{- $joinedLines = add $joinedLines "\n" -}}
 {{- end -}}
 {{- else -}}
-{{- $scratch.Set "joinedLines" (delimit $lines "\n") -}}
+{{- $joinedLines = delimit $lines "\n" -}}
 {{- end -}}

 {{- partial "geturl.html" (dict "scratch" $scratch "path" (.Get 1) "lines" (slice (.Get 2) (.Get 3))) -}}
@@ -47,12 +46,12 @@
       "basePath" ($scratch.Get "bestPath")
       "path" (.Get 1)
       "comment" ($scratch.Get "comment")
-       "code" ($scratch.Get "joinedLines")
+       "code" $joinedLines
       "firstLine" (int (.Get 2))
       "lastLine" (int (.Get 3))
       "language" (.Get 0)
-       "offset" ($scratch.Get "prefixLength")
-       "opts" (printf "linenos=table,linenostart=%d%s" (.Get 2) ($scratch.Get "opts"))
+       "offset" $prefixLength
+       "opts" (printf "linenos=table,linenostart=%d%s" (.Get 2) $opts)
 -}}
 {{- partial "highlightgroup.html" $groupconfig -}}
 {{- with ($scratch.Get "hidden") -}}
--- a/layouts/shortcodes/todo.html
+++ b/layouts/shortcodes/todo.html
@@ -1,3 +0,0 @@
-<div style="background-color: tomato; color: white; padding: 10px;">
-    <em>TODO: </em>{{- .Inner -}}
-</div>
--- a/static/fonts/gen/Inconsolata-700.woff2
+++ b/static/fonts/gen/Inconsolata-700.woff2
Author	SHA1	Message	Date
Danila Fedorin	952502e690	Re-enable syntax highlighting in light mode Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>	2025-04-12 17:56:03 -07:00
Danila Fedorin (aider)	388a4f1589	style: Fix inconsistent indentation in SCSS files for clarity	2025-04-05 19:54:25 -07:00
Danila Fedorin	806d3a318f	Switch TODO to be a quote syntax to avoid shortcodes Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>	2025-03-30 23:11:35 -07:00
Danila Fedorin	b06b695653	Use mutable variables instead of scratch where possible Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>	2025-03-30 22:45:24 -07:00
Danila Fedorin	4ff04221b0	Adjust summaries to account for Hugo breaking changes Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>	2025-03-02 18:59:45 -08:00
Danila Fedorin	c5c57405b0	Update to newer Hugo release Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>	2025-03-02 13:39:41 -08:00
Danila Fedorin	2beded7c14	Remove bold inconsolata font A few bold keywords aren't worth the font Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>	2025-02-23 14:13:25 -08:00