From 2c8c093a30887bfdd49e8e742ceadc3f8614ed16 Mon Sep 17 00:00:00 2001
From: Alex Shpak <alex-shpak@users.noreply.github.com>
Date: Tue, 5 Aug 2025 13:29:30 +0200
Subject: [PATCH] Re-implement columns shortcode as markdown list

---
 assets/_shortcodes.scss                       | 16 +++
 .../content.en/docs/shortcodes/columns.md     | 97 ++++++++-----------
 layouts/_shortcodes/columns.html              | 12 +++
 3 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/assets/_shortcodes.scss b/assets/_shortcodes.scss
index 99ecec4..c01cda1 100644
--- a/assets/_shortcodes.scss
+++ b/assets/_shortcodes.scss
@@ -77,6 +77,22 @@
       min-width: $body-min-width * 0.66;
       padding: 0 $padding-16;
     }
+
+    >ul {
+      list-style: none;
+      display: flex;
+      padding: 0;
+      flex-wrap: wrap;
+
+      >li {
+        @extend .markdown-inner;
+
+        flex: 1 1;
+        margin: $padding-16 0;
+        padding: 0 $padding-16;
+        min-width: $body-min-width * 0.66;
+      }
+    }
   }
 
   // {{< button >}}
diff --git a/exampleSite/content.en/docs/shortcodes/columns.md b/exampleSite/content.en/docs/shortcodes/columns.md
index 7713417..42b1452 100644
--- a/exampleSite/content.en/docs/shortcodes/columns.md
+++ b/exampleSite/content.en/docs/shortcodes/columns.md
@@ -1,80 +1,65 @@
 # Columns
 
-Columns help organize shorter pieces of content horizontally for readability.
+Columns help organize shorter pieces of content horizontally for readability. `columns` shortcode styles markdown list as up to 3 columns.
 
 ## Example
 
-```html
-{{%/* columns [ratio="1:1"] [class="..."] */%}} <!-- begin columns block -->
-# Left Content
-Lorem markdownum insigne...
+```tpl
+{{%/* columns [ratio="1:1"] [class="..."] */%}}
+- ### Left Content
+  Lorem markdownum insigne...
 
-<---> <!-- magic separator, between columns -->
+- ### Mid Content
+  Lorem markdownum insigne...
 
-# Mid Content
-Lorem markdownum insigne...
-
-<---> <!-- magic separator, between columns -->
-
-# Right Content
-Lorem markdownum insigne...
+- ### Right Content
+  Lorem markdownum insigne...
 {{%/* /columns */%}}
 ```
 
 {{% columns %}}
-### Left Content
-Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
-stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
-Miseratus fonte Ditis conubia.
+- ### Left Content
+  Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
+  stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
+  protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
+  Miseratus fonte Ditis conubia.
 
-<--->
+- ### Mid Content
+  Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
+  stringit, frustra Saturnius uteroque inter!
 
-### Mid Content
-Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
-stringit, frustra Saturnius uteroque inter!
-
-<--->
-
-### Right Content
-Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
-stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
-Miseratus fonte Ditis conubia.
+- ### Right Content
+  Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
+  stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
+  protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
+  Miseratus fonte Ditis conubia.
 {{% /columns %}}
 
 ## Settings size ratio for columns
 
-```html
-{{%/* columns ratio="1:2" */%}} <!-- begin columns block -->
-
-## x1 Column
-Lorem markdownum insigne...
-
-<---> <!-- magic separator, between columns -->
-
-## x2 Column
-Lorem markdownum insigne...
+```tpl
+{{%/* columns ratio="1:2" */%}}
+- ## x1 Column
+  Lorem markdownum insigne...
 
+- ## x2 Column
+  Lorem markdownum insigne...
 {{%/* /columns */%}}
 ```
 
 {{% columns ratio="1:2" %}}
-### x1 Column
-Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
-stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
-Miseratus fonte Ditis conubia.
-
-<--->
-
-### x2 Column
-Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
-stringit, frustra Saturnius uteroque inter!
-
-Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
-stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
-protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
-Miseratus fonte Ditis conubia.
+- ### x1 Column
+  Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
+  stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
+  protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
+  Miseratus fonte Ditis conubia.
 
+- ### x2 Column
+  Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
+  stringit, frustra Saturnius uteroque inter!
+  
+  Lorem markdownum insigne. Olympo signis Delphis! Retexi Nereius nova develat
+  stringit, frustra Saturnius uteroque inter! Oculis non ritibus Telethusa
+  protulit, sed sed aere valvis inhaesuro Pallas animam: qui _quid_, ignes.
+  Miseratus fonte Ditis conubia.
 {{% /columns %}}
diff --git a/layouts/_shortcodes/columns.html b/layouts/_shortcodes/columns.html
index bb01da9..89613fd 100644
--- a/layouts/_shortcodes/columns.html
+++ b/layouts/_shortcodes/columns.html
@@ -1,4 +1,6 @@
 {{- $ratio := (split (.Get "ratio") ":") -}}
+{{- if strings.Contains .InnerDeindent "<--->" -}}
+{{ warnf "Columns shortcode seprator '<--->' is deprecated, use markdown list instead." -}}
 <div class="book-columns flex flex-wrap{{ with .Get "class" }} {{ . }}{{ end }}">
 {{ range $index, $content := split .InnerDeindent "<--->" }}
   {{- $grow := default 1 (index $ratio $index) -}}
@@ -7,3 +9,13 @@
   </div>
 {{ end }}
 </div>
+{{ else }}
+<div class="book-columns book-columns-{{ .Ordinal }} {{ with .Get "class" }}{{ . }}{{ end }}">
+  <style>{{- range $index, $grow := $ratio -}}
+    .book-columns-{{ $.Ordinal }}>ul>li:nth-child({{ $index | add 1 }}){
+      flex-grow: {{ $grow }};
+    }
+  {{ end -}}</style>
+  {{ .Inner | safeHTML }}
+</div>
+{{ end -}}