From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/views/testview/testview.html | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/testview/testview.html b/src/main/webapp/views/testview/testview.html
index e18d635..010fd88 100644
--- a/src/main/webapp/views/testview/testview.html
+++ b/src/main/webapp/views/testview/testview.html
@@ -154,19 +154,22 @@
</table>
</div>
<div class="float">
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191">1</li>
- <li style="height: 100px;background-color: #7a8191;margin-bottom: 100px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;margin: 7px">1</li>
+ <li style="height: 100px;background-color: #7a8191;;margin: 7px;">1</li>
+ <div style="height: 100px;width: 100%;background-color: #2e4e7e">
+
+ </div>
</div>
</div>
--
Gitblit v1.9.1