From 54751cb085dc561dbc30e58f1e46bcf425286800 Mon Sep 17 00:00:00 2001
From: MultiMote <contact@mmote.ru>
Date: Wed, 4 Jan 2023 20:26:54 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BE=D0=BA=D0=BE=D0=B2=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D1=8C=20=D0=B2=D0=B5=D0=B7=D0=B4?=
 =?UTF-8?q?=D0=B5=20=D0=B8=20=D0=BA=D0=BE=D1=81=D1=82=D1=8B=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/mmotium/assets/css/_base.scss          |  2 ++
 themes/mmotium/assets/css/style.scss          |  5 +++
 themes/mmotium/layouts/_default/single.html   | 21 ++++++++-----
 .../mmotium/layouts/categories/taxonomy.html  | 31 ++++++++++---------
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/themes/mmotium/assets/css/_base.scss b/themes/mmotium/assets/css/_base.scss
index b977720..ea94f6e 100644
--- a/themes/mmotium/assets/css/_base.scss
+++ b/themes/mmotium/assets/css/_base.scss
@@ -37,4 +37,6 @@ a:active {
 pre {
   max-height: 512px;
   overflow: auto;
+  white-space: pre-wrap;
+  word-wrap: break-word;
 }
\ No newline at end of file
diff --git a/themes/mmotium/assets/css/style.scss b/themes/mmotium/assets/css/style.scss
index eba2697..d91b525 100644
--- a/themes/mmotium/assets/css/style.scss
+++ b/themes/mmotium/assets/css/style.scss
@@ -145,11 +145,16 @@ section.posts {
     }
   }
 
+  .content-column {
+    width: 100%;
+  }
+
   .sidebar {
     & {
       display: flex;
       flex-direction: column;
       min-width: 300px;
+      width: 300px;
       gap: 16px;
     }
 
diff --git a/themes/mmotium/layouts/_default/single.html b/themes/mmotium/layouts/_default/single.html
index c82e38f..278ed8c 100644
--- a/themes/mmotium/layouts/_default/single.html
+++ b/themes/mmotium/layouts/_default/single.html
@@ -11,15 +11,20 @@
 {{end}}
 
 {{ define "main" }}
-    <article class="single post">
-        <h1>{{ .Title }}</h1>
+<div class="page-wrapper">
+    <div class="content-column">
+        <section class="single post">
+            <h1>{{ .Title }}</h1>
 
-        <p>
-            {{- .Content -}}
-        </p>
-    </article>
+            <p>
+                {{- .Content -}}
+            </p>
+        </section>
 
-    <div class="comments">
-        {{ template "_internal/disqus.html" . }}
+        <section class="comments">
+            {{ template "_internal/disqus.html" . }}
+        </section>
     </div>
+    {{ partial "sidebar.html" . }}
+</div>
 {{ end }}
\ No newline at end of file
diff --git a/themes/mmotium/layouts/categories/taxonomy.html b/themes/mmotium/layouts/categories/taxonomy.html
index da0ec8b..b57cb1d 100644
--- a/themes/mmotium/layouts/categories/taxonomy.html
+++ b/themes/mmotium/layouts/categories/taxonomy.html
@@ -1,20 +1,21 @@
 {{ define "main" }}
+<div class="page-wrapper">
+    <div class="content-column">
+        <div class="single post">
+            <header>
+                <h1>Категория - {{ .Title }}</h1>
+                <p class="subhead">{{ .Params.description }}</p>
+            </header>
 
+            <p>Тут есть:</p>
 
-<div class="single post">
-    <header>
-        <h1>Категория - {{ .Title }}</h1>
-        <p class="subhead">{{ .Params.description }}</p>
-    </header>
-
-    <p>Тут есть:</p>
-
-    <ul>
-        {{ range .Pages }}
-            <li hugo-nav="{{ .RelPermalink}}"><a href="{{ .Permalink}}">{{ .LinkTitle }}</a></li>
-        {{ end }}
-    </ul>
+            <ul>
+                {{ range .Pages }}
+                <li hugo-nav="{{ .RelPermalink}}"><a href="{{ .Permalink}}">{{ .LinkTitle }}</a></li>
+                {{ end }}
+            </ul>
+        </div>
+    </div>
+    {{ partial "sidebar.html" . }}
 </div>
-
-
 {{ end }}
\ No newline at end of file