Re-enable syntax highlighting in light mode

Signed-off-by: Danila Fedorin <danila.fedorin@gmail.com>

assets/scss/code.scss

@@ -15,10 +15,10 @@
 }
 
 code {
-  font-family: $font-code;
-  @include var(background-color, code-color);
-  border: $code-border;
-  padding: 0 0.25rem 0 0.25rem;
+    font-family: $font-code;
+    @include var(background-color, code-color);
+    border: $code-border;
+    padding: 0 0.25rem 0 0.25rem;
 }
 
 pre code {
@@ -40,12 +40,12 @@ pre code {
         margin-bottom: 1rem;
 
         a {
-          color: inherit;
-          border: none;
+            color: inherit;
+            border: none;
 
-          &:hover, &:focus {
-            background-color: rgba($primary-color, 0.25);
-          }
+            &:hover, &:focus {
+                background-color: rgba($primary-color, 0.25);
+            }
         }
 
         td {

assets/scss/fonts.scss

@@ -1,41 +1,41 @@
 @mixin font-inconsolata($weight) {
-  @font-face {
-    font-family: 'Inconsolata';
-    font-display: swap;
-    font-weight: $weight;
-    src: local('Inconsolata'),
-         url('../fonts/gen/Inconsolata-#{$weight}.woff2');
-  }
+    @font-face {
+        font-family: 'Inconsolata';
+        font-display: swap;
+        font-weight: $weight;
+        src: local('Inconsolata'),
+             url('../fonts/gen/Inconsolata-#{$weight}.woff2');
+    }
 }
 
 @mixin font-lora {
-  @font-face {
-    font-family: 'Lora';
-    font-display: swap;
-    src: local('Lora'),
-         url('../fonts/gen/Lora-Regular.woff2'),
-         url('../fonts/gen/Lora-Italic.woff2');
-  }
+    @font-face {
+        font-family: 'Lora';
+        font-display: swap;
+        src: local('Lora'),
+             url('../fonts/gen/Lora-Regular.woff2'),
+             url('../fonts/gen/Lora-Italic.woff2');
+    }
 }
 
 @mixin font-raleway($weight) {
-  @font-face {
-    font-family: 'Raleway';
-    font-display: swap;
-    font-weight: $weight;
-    src: local('Raleway'),
-         url('../fonts/gen/Raleway-#{$weight}.woff2'),
-         url('../fonts/gen/Raleway-#{$weight}-Italic.woff2');
-  }
+    @font-face {
+        font-family: 'Raleway';
+        font-display: swap;
+        font-weight: $weight;
+        src: local('Raleway'),
+             url('../fonts/gen/Raleway-#{$weight}.woff2'),
+             url('../fonts/gen/Raleway-#{$weight}-Italic.woff2');
+    }
 }
 
 @mixin font-stixgeneral {
-  @font-face {
-    font-family: 'STIXGeneral';
-    font-display: swap;
-    src: local('STIXGeneral-Regular'),
-         url('../fonts/STIXGeneral-Regular.ttf');
-  }
+    @font-face {
+        font-family: 'STIXGeneral';
+        font-display: swap;
+        src: local('STIXGeneral-Regular'),
+             url('../fonts/STIXGeneral-Regular.ttf');
+    }
 }
 
 @include font-inconsolata(400);

assets/scss/mixins.scss

@@ -6,7 +6,7 @@
 }
 
 @mixin below-container-width {
-    @media screen and (max-width: $container-width-threshold){
+    @media screen and (max-width: $container-width-threshold) {
         @content;
     }
 }
@@ -16,17 +16,17 @@
 }
 
 @mixin textual-input {
-  @include bordered-block;
-  box-sizing: border-box;
-  @include var(background-color, background-color);
-  @include var(color, text-color);
-  font-family: $font-body;
-  padding: $input-padding;
+    @include bordered-block;
+    box-sizing: border-box;
+    @include var(background-color, background-color);
+    @include var(color, text-color);
+    font-family: $font-body;
+    padding: $input-padding;
 
-  &:active, &:focus {
-      @include green-shadow;
-      border-color: $primary-color;
-  }
+    &:active, &:focus {
+        @include green-shadow;
+        border-color: $primary-color;
+    }
 
-  flex-grow: 1;
+    flex-grow: 1;
 }

assets/scss/search.scss

@@ -43,7 +43,7 @@ input.stork-input {
     padding: $search-element-padding;
 }
 
-.stork-message:not(:last-child), .stork-result  {
+.stork-message:not(:last-child), .stork-result {
     border-bottom: $standard-border;
 }
 

assets/scss/style.scss

@@ -4,169 +4,169 @@
 @import "modes.scss";
 
 body {
-  @include var(background-color, background-color);
-  @include var(color, text-color);
-  font-family: $font-body;
-  font-size: 1.0rem;
-  line-height: 1.5;
-  margin-bottom: 1rem;
-  text-align: justify;
+    @include var(background-color, background-color);
+    @include var(color, text-color);
+    font-family: $font-body;
+    font-size: 1.0rem;
+    line-height: 1.5;
+    margin-bottom: 1rem;
+    text-align: justify;
 
-  @include below-container-width {
-    text-align: left;
-  }
+    @include below-container-width {
+        text-align: left;
+    }
 }
 
 h1, h2, h3, h4, h5, h6 {
-  margin-bottom: .1rem;
-  margin-top: .5rem;
-  font-family: $font-heading;
-  font-weight: normal;
-  text-align: center;
+    margin-bottom: .1rem;
+    margin-top: .5rem;
+    font-family: $font-heading;
+    font-weight: normal;
+    text-align: center;
 
-  &:target {
-    @include var(background-color, target-background-color);
-    border-radius: 1rem;
-  }
-
-  a {
-    border-bottom: none;
-
-    &:hover {
-      color: $primary-color;
+    &:target {
+        @include var(background-color, target-background-color);
+        border-radius: 1rem;
+    }
+
+    a {
+        border-bottom: none;
+
+        &:hover {
+            color: $primary-color;
+        }
     }
-  }
 }
 
 p {
-  &:target {
-    @include var(background-color, target-background-color);
-    border-radius: 0.25rem;
-  }
+    &:target {
+        @include var(background-color, target-background-color);
+        border-radius: 0.25rem;
+    }
 }
 
 .container {
-  position: relative;
-  margin: auto;
-  width: 100%;
-  max-width: $container-width;
-  box-sizing: border-box;
+    position: relative;
+    margin: auto;
+    width: 100%;
+    max-width: $container-width;
+    box-sizing: border-box;
 
-  @include below-container-width {
-      padding: 0 $container-min-padding 0 $container-min-padding;
-      margin: 0;
-      max-width: $container-width + 2 * $container-min-padding;
-  }
+    @include below-container-width {
+        padding: 0 $container-min-padding 0 $container-min-padding;
+        margin: 0;
+        max-width: $container-width + 2 * $container-min-padding;
+    }
 
-  @include below-two-margins {
-      left: -($margin-width + $margin-inner-offset + $margin-outer-offset)/2;
-  }
+    @include below-two-margins {
+        left: -($margin-width + $margin-inner-offset + $margin-outer-offset) / 2;
+    }
 
-  @include below-one-margin {
-      left: 0;
-  }
+    @include below-one-margin {
+        left: 0;
+    }
 }
 
 .button, input[type="submit"] {
-  @include var(color, text-color);
-  padding: 0.5rem;
-  border: 1px solid $primary-color;
-  transition: color 0.25s, background-color 0.25s;
-  text-align: left;
-
-  &:focus {
-    outline: none;
-  }
-
-  &:hover, &:focus {
-    background-color: rgba($primary-color, 0.2);
     @include var(color, text-color);
-  }
+    padding: 0.5rem;
+    border: 1px solid $primary-color;
+    transition: color 0.25s, background-color 0.25s;
+    text-align: left;
+
+    &:focus {
+        outline: none;
+    }
+
+    &:hover, &:focus {
+        background-color: rgba($primary-color, 0.2);
+        @include var(color, text-color);
+    }
 }
 
 .input[type="text"], textarea {
-  @include textual-input;
+    @include textual-input;
 }
 
 nav {
-  width: 100%;
-  margin: 0rem 0rem 1rem 0rem;
+    width: 100%;
+    margin: 0rem 0rem 1rem 0rem;
 
-  .container {
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-  }
+    .container {
+        display: flex;
+        justify-content: center;
+        flex-wrap: wrap;
+    }
 
-  a {
-    padding: 0.25rem 0.75rem 0.25rem .75rem;
-    text-decoration: none;
-    @include var(color, text-color);
-    display: inline-block;
-    border-bottom: none;
-    white-space: nowrap;
-  }
+    a {
+        padding: 0.25rem 0.75rem 0.25rem .75rem;
+        text-decoration: none;
+        @include var(color, text-color);
+        display: inline-block;
+        border-bottom: none;
+        white-space: nowrap;
+    }
 }
 
 .post-subscript {
-  text-align: center;
+    text-align: center;
 }
 
 .post-content {
-  margin-top: .5rem;
+    margin-top: .5rem;
 }
 
 h1 {
-  font-size: 3.0rem;
+    font-size: 3.0rem;
 }
 
 h2 {
-  font-size: 2.6rem;
+    font-size: 2.6rem;
 }
 
 h3 {
-  font-size: 2.2rem;
+    font-size: 2.2rem;
 }
 
 h4 {
-  font-size: 1.8rem;
+    font-size: 1.8rem;
 }
 
 h5 {
-  font-size: 1.4rem;
+    font-size: 1.4rem;
 }
 
 h6 {
-  font-size: 1.0rem;
+    font-size: 1.0rem;
 }
 
 a {
-  @include var(color, text-color);
-  text-decoration: none;
-  border-bottom: .2rem solid $primary-color;
+    @include var(color, text-color);
+    text-decoration: none;
+    border-bottom: .2rem solid $primary-color;
 
-  &:hover {
-    color: $primary-color;
-    transition: color 0.25s;
-  }
-
-  &.external-link, &.same-page-link {
-    .feather {
-      fill: none;
-      margin-left: 0.25rem;
-      position: relative;
-      top: 0.125em;
+    &:hover {
+        color: $primary-color;
+        transition: color 0.25s;
+    }
+
+    &.external-link, &.same-page-link {
+        .feather {
+            fill: none;
+            margin-left: 0.25rem;
+            position: relative;
+            top: 0.125em;
+        }
     }
-  }
 }
 
 .draft-link {
-  border-bottom: .2rem solid $border-color;
+    border-bottom: .2rem solid $border-color;
 }
 
 img {
-  max-width: 100%;
-  background-color: white;
+    max-width: 100%;
+    background-color: white;
 }
 
 table {
@@ -247,25 +247,25 @@ ul.post-list {
 
     p.post-wordcount, p.post-status {
         text-align: center;
-        margin-bottom: 0.6rem;
+        margin-bottom: 1rem;
     }
 
     .series-link {
-      display: flex;
-      align-items: center;
+        display: flex;
+        align-items: center;
 
-      margin-top: 1rem;
-      font-size: 1.1rem;
-      border-top: $standard-border;
-      padding-top: 1rem;
+        margin-top: 1rem;
+        font-size: 1.1rem;
+        border-top: $standard-border;
+        padding-top: 1rem;
 
-      .feather {
-        fill: none;
-        flex-shrink: 0;
-        width: 1em;
-        height: 1em;
-        margin-right: 0.5em;
-      }
+        .feather {
+            fill: none;
+            flex-shrink: 0;
+            width: 1em;
+            height: 1em;
+            margin-right: 0.5em;
+        }
     }
 }
 
@@ -309,8 +309,8 @@ figure {
     }
 
     &.fullwide {
-      margin-left: 0;
-      margin-right: 0;
+        margin-left: 0;
+        margin-right: 0;
     }
 }
 
@@ -330,21 +330,20 @@ 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;
-  height: 1rem;
-  stroke: currentColor;
-  stroke-width: 2;
-  stroke-linecap: round;
-  stroke-linejoin: round;
-  fill: currentColor;
+    width: 1rem;
+    height: 1rem;
+    stroke: currentColor;
+    stroke-width: 2;
+    stroke-linecap: round;
+    stroke-linejoin: round;
+    fill: currentColor;
 }
 
 .katex * {
-  font-family: unset;
+    font-family: unset;
 }
 
 .block {
@@ -356,7 +355,7 @@ figure {
 
 .dialog {
     .message {
-        max-width: 0.8*$container-width;
+        max-width: 0.8 * $container-width;
         margin-top: 0.5rem;
         display: flex;
         flex-direction: row;
@@ -390,19 +389,18 @@ figure {
     flex-wrap: wrap;
 
     .wrapper {
-      flex-grow: 1;
-      display: flex;
+        flex-grow: 1;
+        display: flex;
 
-      &.previous {
-          justify-content: left;
-      }
+        &.previous {
+            justify-content: left;
+        }
 
-      &.next {
-          justify-content: right;
-      }
+        &.next {
+            justify-content: right;
+        }
     }
 
-
     a, .ongoing-placeholder {
         @include bordered-block;
         padding: 0.5em 1em 0.5em 1em;
@@ -412,16 +410,16 @@ figure {
         margin-top: 1em;
 
         .feather {
-          height: 1.25em;
-          width: 1.25em;
-          fill: none;
-          &:first-child { margin-right: 0.5em; }
-          &:last-child { margin-left: 0.5em; }
+            height: 1.25em;
+            width: 1.25em;
+            fill: none;
+            &:first-child { margin-right: 0.5em; }
+            &:last-child { margin-left: 0.5em; }
         }
     }
 
     .ongoing-placeholder {
-      border-style: dashed;
+        border-style: dashed;
     }
 
     div.title {
@@ -476,26 +474,26 @@ blockquote {
 }
 
 .side-by-side-item {
-  flex-basis: 0;
+    flex-basis: 0;
 }
 
 .internal-ref {
-  text-decoration: underline;
-  break-inside: avoid;
+    text-decoration: underline;
+    break-inside: avoid;
 
-  &:target {
-    @include var(background-color, target-background-color);
-    border-radius: 1rem;
+    &:target {
+        @include var(background-color, target-background-color);
+        border-radius: 1rem;
 
-    .internal-ref-counter {
-      @include var(background-color, target-background-color);
+        .internal-ref-counter {
+            @include var(background-color, target-background-color);
+        }
     }
-  }
 }
 
 .internal-ref-counter {
-  display: inline-block;
-  border: $standard-border;
-  border-radius: 0.5rem;
-  padding: 0 0.25rem 0 0.25rem;
+    display: inline-block;
+    border: $standard-border;
+    border-radius: 0.5rem;
+    padding: 0 0.25rem 0 0.25rem;
 }

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;

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 }}

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 */ -}}

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) }}

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 -}}

layouts/partials/summary.html

@@ -0,0 +1,5 @@
+{{- if .Params.summary -}}
+{{ .Params.summary }}
+{{- else -}}
+{{ .Summary | plainify | truncate 180 }}
+{{- end -}}

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 }}

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") -}}

layouts/shortcodes/todo.html

@@ -1,3 +0,0 @@
-<div style="background-color: tomato; color: white; padding: 10px;">
-    <em>TODO: </em>{{- .Inner -}}
-</div>