From 9029289ef176516be775c96755fc2c6ef5998034 Mon Sep 17 00:00:00 2001 From: liuzhihang Date: Sat, 22 Oct 2022 12:35:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=8F=AF=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E4=BE=A7=E6=A0=8F=E7=9A=84=E5=B7=A6=E5=8F=B3=E5=8F=8A=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- settings.yaml | 11 +++++++++++ templates/assets/zhheo/zhheoblog.css | 22 ++++++++++++++++++++++ templates/index.html | 2 +- templates/modules/aside.html | 2 +- templates/modules/layouts/layout.html | 1 - templates/modules/rightside.html | 14 -------------- templates/modules/widgets/console.html | 4 +++- 7 files changed, 38 insertions(+), 18 deletions(-) delete mode 100644 templates/modules/rightside.html diff --git a/settings.yaml b/settings.yaml index 4a112641..d607c2f3 100644 --- a/settings.yaml +++ b/settings.yaml @@ -131,6 +131,17 @@ spec: - group: sidebar label: 侧边栏 formSchema: + - $formkit: select + name: location + label: 侧边栏位置 + value: "right" + options: + - value: "hide" + label: "隐藏" + - value: "right" + label: "右侧" + - value: "left" + label: "左侧" - $formkit: textarea name: widgets label: 小部件（无效） diff --git a/templates/assets/zhheo/zhheoblog.css b/templates/assets/zhheo/zhheoblog.css index 5ae2ce89..24fa49fc 100644 --- a/templates/assets/zhheo/zhheoblog.css +++ b/templates/assets/zhheo/zhheoblog.css @@ -7167,6 +7167,28 @@ span.fund_name { width: calc(100% - 300px); } +/* 当隐藏边栏时，显示 100% */ +.layout.hide > div:first-child { + width: 100%; +} + +/* 侧边栏在左侧时，显示 100% */ +.layout.left > div:first-child { + -webkit-box-ordinal-group: 2; + -moz-box-ordinal-group: 2; + -o-box-ordinal-group: 2; + -ms-flex-order: 2; + -webkit-order: 2; + order: 2; +} + +/* 侧栏在左侧时，关闭左边距，打开右边距 */ +.layout.left .aside-content { + padding-right: 15px; + padding-left: 0px !important; +} + + div#categoryList { display: flex; width: 100%; diff --git a/templates/index.html b/templates/index.html index 989c5239..461baa26 100644 --- a/templates/index.html +++ b/templates/index.html @@ -15,7 +15,7 @@
-
+
diff --git a/templates/modules/aside.html b/templates/modules/aside.html index a57202a7..f5bbf4d8 100644 --- a/templates/modules/aside.html +++ b/templates/modules/aside.html @@ -1,7 +1,7 @@ -
+
diff --git a/templates/modules/layouts/layout.html b/templates/modules/layouts/layout.html index 90474b00..4eadcde1 100644 --- a/templates/modules/layouts/layout.html +++ b/templates/modules/layouts/layout.html @@ -47,7 +47,6 @@
-