From e9449a5f9be67a8228d90ce91d8ce40dc2028685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
 <3277200+sentsim@users.noreply.github.com>
Date: Wed, 19 Feb 2025 22:49:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=20`layui-text`=20?=
 =?UTF-8?q?=E5=9C=A8=E6=B7=B7=E5=90=88=E5=88=97=E8=A1=A8=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20(#2510)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/class/index.md | 31 +++++++++++++++++++++++++++++++
 src/css/layui.css   | 17 ++++++++++++-----
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/docs/class/index.md b/docs/class/index.md
index dcf3dc6d..00140bff 100644
--- a/docs/class/index.md
+++ b/docs/class/index.md
@@ -178,6 +178,37 @@ toc: true
       <li>列表3</li>
     </ol>
 
+    <h3>混合列表</h3>
+    <ol>
+      <li>
+        <p>有序列表1</p>
+        <ul>
+          <li>无序列表1-1</li>
+          <li>无序列表1-2</li>
+          <li>无序列表1-3</li>
+        </ul>
+      </li>
+      <li>
+        <p>有序列表2</p>
+        <ul>
+          <li>
+            <p>无序列表2-1</p>
+            <ol>
+              <li>有序列表2-1-1</li>
+              <li>有序列表2-1-2</li>
+            </ol>
+          </li>
+          <li>
+            <p>无序列表2-2</p>
+            <ol>
+              <li>有序列表2-2-1</li>
+            </ol>
+          </li>
+        </ul>
+      </li>
+      <li>有序列表3</li>
+    </ol>
+
     <h3>Blockquote</h3>
     <blockquote>
       <p>引用</p>
diff --git a/src/css/layui.css b/src/css/layui.css
index 4f22fc30..00f9e72b 100644
--- a/src/css/layui.css
+++ b/src/css/layui.css
@@ -656,20 +656,27 @@ hr.layui-border-black{border-width: 0 0 1px;}
 .layui-text h4{margin: 11px 0; font-size: 16px;}
 .layui-text h5{margin: 11px 0; font-size: 14px;}
 .layui-text h6{margin: 11px 0; font-size: 13px;}
+.layui-text p{margin: 15px 0;}
+.layui-text p:first-child{margin-top: 0;}
+.layui-text p:last-child{margin-bottom: 0;}
+.layui-text hr{margin: 15px 0;}
 .layui-text ul,
 .layui-text ol{padding-left: 15px;}
 .layui-text ul li{margin-top: 5px; list-style-type: disc;}
 .layui-text ol li{margin-top: 5px; list-style-type: decimal;}
-.layui-text-em,
-.layui-word-aux{color: #999 !important; padding-left: 5px !important; padding-right: 5px !important;}
-.layui-text p{margin: 15px 0;}
-.layui-text p:first-child{margin-top: 0;}
-.layui-text p:last-child{margin-bottom: 0;}
+.layui-text ul ul > li,
+.layui-text ol ul > li{list-style-type: disc;}
+.layui-text ul li > p:first-child,
+.layui-text ol li > p:first-child{margin-top: 0; margin-bottom: 0;}
 .layui-text a:not(.layui-btn){color: #01AAED;}
 .layui-text a:not(.layui-btn):hover{text-decoration: underline;}
 .layui-text blockquote:not(.layui-elem-quote){margin: 15px 0; padding: 5px 15px; border-left: 5px solid #eee;}
 .layui-text pre > code:not(.layui-code){display: block; padding: 15px; font-family: "Courier New",Consolas,"Lucida Console", monospace;}
 
+/* 文本区域辅助  */
+.layui-text-em,
+.layui-word-aux{color: #999 !important; padding-left: 5px !important; padding-right: 5px !important;}
+
 /* 字体大小 */
 .layui-font-12{font-size: 12px !important;}
 .layui-font-13{font-size: 13px !important;}