From 4438926211e05997d65d61f83ed1ba38d43c6755 Mon Sep 17 00:00:00 2001
From: Razon Yang <razonyang@gmail.com>
Date: Thu, 22 Aug 2024 12:28:36 +0800
Subject: [PATCH] fix: broken layouts (#1060)

---
 assets/main/scss/_sidebar.scss                | 22 ++++++++++++++-----
 exampleSite/content/docs/content/index.md     | 14 ------------
 .../content/docs/content/index.zh-hans.md     | 14 ------------
 .../content/docs/content/index.zh-hant.md     | 14 ------------
 layouts/_default/single.html                  |  2 +-
 layouts/docs/single.html                      |  2 +-
 layouts/landing/single.html                   |  2 +-
 .../partials/functions/container-class.html   |  6 ++++-
 8 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/assets/main/scss/_sidebar.scss b/assets/main/scss/_sidebar.scss
index b26856266..5ac78322b 100644
--- a/assets/main/scss/_sidebar.scss
+++ b/assets/main/scss/_sidebar.scss
@@ -9,16 +9,28 @@
   }
 }
 
-main {
+main.sidebar {
   &.sidebar-none {
     .sidebar {
       display: none !important;
     }
 
-    .content {
-      > div:first-of-type {
-        width: 100%!important;
-      }
+    .content-posts {
+      @extend .col-xxl-12;
+    }
+
+    .content-docs {
+      @extend .col-xxl-10;
+    }
+  }
+
+
+  &:not(.sidebar-none) {
+    .content-docs {
+      @extend .col-xxl-7;
+    }
+    .content-posts {
+      @extend .col-xxl-8;
     }
   }
 }
diff --git a/exampleSite/content/docs/content/index.md b/exampleSite/content/docs/content/index.md
index 4900b99a1..b67528bcf 100644
--- a/exampleSite/content/docs/content/index.md
+++ b/exampleSite/content/docs/content/index.md
@@ -74,20 +74,6 @@ And the append `type = "docs"` on the front matter of `archetypes/notes.md`. Now
 
 Similarly, you can also custom the archetypes for `posts`, `docs` and so on.
 
-## Sections Template
-
-You may also want to use the same list layout of `docs` on `notes`.
-
-```html {title="layouts/notes/list.html"}
-{{ define "content" }}
-{{- partial "docs/nav" . -}}
-<div class="col ms-auto">
-  {{ partial "docs/list" . }}
-</div>
-{{- partial "docs/sidebar" . -}}
-{{ end }}
-```
-
 ## Write New Articles
 
 > Suppose the default language is `en`.
diff --git a/exampleSite/content/docs/content/index.zh-hans.md b/exampleSite/content/docs/content/index.zh-hans.md
index 51d317fcd..d1e508ee0 100644
--- a/exampleSite/content/docs/content/index.zh-hans.md
+++ b/exampleSite/content/docs/content/index.zh-hans.md
@@ -73,20 +73,6 @@ $ cp themes/hugo-theme-bootstrap/archetypes/default.md archetypes/notes.md
 
 同样地，你也可以为 `posts`、`docs` 等自定义原型。
 
-## Sections 模板
-
-你可能还想在 `notes` 中使用和 `docs` 一样的列表布局。
-
-```html {title="layouts/notes/list.html"}
-{{ define "content" }}
-{{- partial "docs/nav" . -}}
-<div class="col ms-auto">
-  {{ partial "docs/list" . }}
-</div>
-{{- partial "docs/sidebar" . -}}
-{{ end }}
-```
-
 ## 书写文章
 
 > 假设默认语言为 `en`。
diff --git a/exampleSite/content/docs/content/index.zh-hant.md b/exampleSite/content/docs/content/index.zh-hant.md
index 5fed0dda3..4ac40660c 100644
--- a/exampleSite/content/docs/content/index.zh-hant.md
+++ b/exampleSite/content/docs/content/index.zh-hant.md
@@ -73,20 +73,6 @@ $ cp themes/hugo-theme-bootstrap/archetypes/default.md archetypes/notes.md
 
 同樣地，你也可以為 `posts`、`docs` 等自定義原型。
 
-## Sections 模板
-
-你可能還想在 `notes` 中使用和 `docs` 一樣的列表布局。
-
-```html {title="layouts/notes/list.html"}
-{{ define "content" }}
-{{- partial "docs/nav" . -}}
-<div class="col ms-auto">
-  {{ partial "docs/list" . }}
-</div>
-{{- partial "docs/sidebar" . -}}
-{{ end }}
-```
-
 ## 書寫文章
 
 > 假設默認語言為 `en`。
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3cc496d43..6f7b636d5 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,5 +1,5 @@
 {{ define "content" }}
-<div class="{{ if default true .Params.sidebar }}col-xxl-8{{ else }}col-xxl-12{{ end }}">
+<div class="content-posts {{ if default true .Params.sidebar }}col-xxl-8{{ else }}col-xxl-12{{ end }}">
   <div class="container">
     {{- partial "breadcrumb" . -}}
     {{- partial "post" . -}}
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
index 36a0fc61c..2d906b340 100644
--- a/layouts/docs/single.html
+++ b/layouts/docs/single.html
@@ -1,6 +1,6 @@
 {{ define "content" }}
 {{- partial "docs/nav" . -}}
-<div class="col ms-auto">
+<div class="col ms-auto content-docs">
   <div class="container-fluid">
     {{- partial "breadcrumb" . -}}
     {{- partial "docs/post" . -}}
diff --git a/layouts/landing/single.html b/layouts/landing/single.html
index 9c0f7f426..09602c2d0 100644
--- a/layouts/landing/single.html
+++ b/layouts/landing/single.html
@@ -1,5 +1,5 @@
 {{ define "content" }}
-<div class="{{ if default true .Params.sidebar }}col-xxl-8{{ else }}col-xxl-12{{ end }}">
+<div class="content-posts {{ if default true .Params.sidebar }}col-xxl-8{{ else }}col-xxl-12{{ end }}">
   {{ .Content }}
 </div>
 {{- partial "sidebar" . }}
diff --git a/layouts/partials/functions/container-class.html b/layouts/partials/functions/container-class.html
index d418ee7d9..8dde45ab1 100644
--- a/layouts/partials/functions/container-class.html
+++ b/layouts/partials/functions/container-class.html
@@ -1,2 +1,6 @@
 {{- $fullWidth := partialCached "functions/full-width" .FirstSection }}
-{{- return cond $fullWidth "container-fluid" "container" -}}
+{{- $class := "" }}
+{{- if default true .Params.sidebar }}
+  {{- $class = "sidebar" }}
+{{- end }}
+{{- return (cond $fullWidth "container-fluid" "container" | printf "%s %s" $class ) -}}