Merge pull request #193 from liuzhihang/dev

Dev
This commit is contained in:
liuzhihang 2023-06-17 17:15:27 +08:00 committed by GitHub
commit 56251ef097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 20 deletions

View File

@ -517,7 +517,6 @@ spec:
- $formkit: text
name: url
label: 链接
validation: "url"
- $formkit: radio
name: urlType
label: 链接类型

View File

@ -11627,7 +11627,7 @@ figure.gallery-group:hover .gallery-group-name::after {
#bber .timeline ul li.item {
position: relative;
width: 32%;
width: 30%;
border: var(--style-border-always);
border-radius: 12px;
padding: 1rem 1rem 0.5rem;
@ -11723,7 +11723,7 @@ figure.gallery-group:hover .gallery-group-name::after {
/* 每条动态 */
#bber div.bber-content {
display: flex;
/*display: flex;*/
flex-direction: initial;
flex-wrap: wrap;
border-radius: 12px;
@ -11910,7 +11910,7 @@ figure.gallery-group:hover .gallery-group-name::after {
}
/* 内容 */
#bber .bber-content .datacont {
#bber .bber-content p {
order: 0;
font-size: 0.8rem;
font-weight: bold;
@ -11922,6 +11922,7 @@ figure.gallery-group:hover .gallery-group-name::after {
display: flex;
flex-direction: column;
text-align: justify;
overflow-wrap: break-word;
}
/* 设备 */

View File

@ -28,6 +28,10 @@
<script th:src="@{/assets/lib/pjax.min.js}"></script>
<script th:src="@{/assets/lib/snackbar.min.js}"></script>
<script th:src="@{/assets/lib/view-image.min.js}"></script>
<link th:href="@{/assets/lib/swiper.min.css}" rel="stylesheet">
<script th:src="@{/assets/lib/swiper.min.js}"></script>
<div id="js-pjax"></div>
<script th:src="@{/assets/js/extend/covercolor/web.js}"></script>
<script>

View File

@ -1,17 +1,21 @@
<!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<div class="bbTimeList container" id="bbTimeList" th:fragment="moment" th:if="!${pluginFinder.available('PluginMoments')}">
<div class="bbTimeList container" id="bbTimeList" th:fragment="moment"
th:if="!${pluginFinder.available('PluginMoments')}">
<!-- 未安装插件 -->
<i class="bber-logo fa-regular fa-bell icon-bblogo" onclick="" title="瞬间"></i>
<div class="swiper-container swiper-no-swiping swiper-container-initialized swiper-container-vertical swiper-container-pointer-events"
id="bbtalk" tabindex="-1">
<div class="swiper-wrapper" id="bber-talk" onclick="location.href=location.href='https\:\/\/github.com/halo-sigs/plugin-moments'">
<div class="swiper-wrapper" id="bber-talk"
onclick="location.href=location.href='https\:\/\/github.com/halo-sigs/plugin-moments'">
<div class="li-style swiper-slide">这里需要安装瞬间的插件</div>
<div class="li-style swiper-slide">去安装吧!</div>
</div>
</div>
<i class="bber-gotobb fas fa-arrow-circle-right" onclick="location.href=location.href='https\:\/\/github.com/halo-sigs/plugin-moments'"
<i class="bber-gotobb fas fa-arrow-circle-right"
onclick="location.href=location.href='https\:\/\/github.com/halo-sigs/plugin-moments'"
title="下载插件"></i>
</div>
@ -19,11 +23,13 @@
th:if="${theme.config.top.moment} and ${pluginFinder.available('PluginMoments')}">
<!-- 瞬间插件 -->
<i class="bber-logo fa-regular fa-bell icon-bblogo" onclick="" title="瞬间"></i>
<div class="swiper-container swiper-no-swiping swiper-container-initialized swiper-container-vertical swiper-container-pointer-events"
<div class="swiper-container swiper-no-swiping swiper-container-initialized swiper-container-vertical swiper-container-pointer-events swiper-initialized swiper-vertical swiper-backface-hidden"
id="bbtalk" tabindex="-1">
<div class="swiper-wrapper" id="bber-talk" onclick="location.href='/moments'" th:if="${momentFinder}">
<th:block th:each="moment : ${momentFinder.listAll()}" th:with="content=${moment.spec.content}">
<div class="li-style swiper-slide" th:if="${not #strings.isEmpty(content.html)}"
<div aria-live="off" class="swiper-wrapper" id="bber-talk" onclick="location.href='/moments'"
th:if="${momentFinder}">
<th:block th:each="moment,iterStat : ${momentFinder.list(1, 10)}" th:with="content=${moment.spec.content}">
<div class="li-style swiper-slide" role="group" style="height: 25px;"
th:if="${not #strings.isEmpty(content.html)}"
th:text="${#strings.substringBefore(#strings.substringAfter(content.html,'<p>'),'</p>')}"></div>
</th:block>
</div>

View File

@ -28,17 +28,19 @@
</div>
</div>
</div>
<script data-pjax="" defer="" src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/aplayer/1.10.1/APlayer.min.js"></script>
<script data-pjax="" defer="" src="https://cdn.zhheo.com/public/aplayer/Meting2.min.js"></script>
<link href="https://cdn.zhheo.com/public/aplayer/APlayer.min.css" rel="stylesheet external nofollow">
<!-- <script data-pjax="" defer="" src="https://lf6-cdn-tos.bytecdntp.com/cdn/expire-1-M/aplayer/1.10.1/APlayer.min.js"></script>-->
<!-- <script data-pjax="" defer="" src="https://cdn.zhheo.com/public/aplayer/Meting2.min.js"></script>-->
<!-- <link href="https://cdn.zhheo.com/public/aplayer/APlayer.min.css" rel="stylesheet external nofollow">-->
<div id="bber">
<section class="timeline page-1">
<ul class="list" id="waterfall">
<li class="item" th:each="moment : ${moments.items}" th:with="content=${moment.spec.content}">
<div class="bber-content">
<p class="datacont" th:if="${not #strings.isEmpty(content.html)}" th:utext="${content.html}"></p>
</div>
<th:block th:each="momentItem : ${content.medium}" th:if="${not #lists.isEmpty(content.medium)}">
<ul class="list show" id="waterfall">
<li class="item" th:each="moment : ${moments.items}"
th:with="content=${moment.spec.content}">
<div class="bber-content" th:if="${not #strings.isEmpty(content.html)}"
th:utext="${content.html}"></div>
<th:block th:each="momentItem : ${content.medium}"
th:if="${not #lists.isEmpty(content.medium)}">
<div class="bber-content-img" th:if="${momentItem.type.name == 'PHOTO'}">
<img class="bber-content-image-self entered loaded"
@ -66,6 +68,15 @@
</ul>
</section>
<!-- 分页还没写 -->
<div th:if="${moments.hasPrevious() || moments.hasNext()}">
<a th:href="@{${moments.prevUrl}}">
<span>上一页</span>
</a>
<span th:text="${moments.page}"></span>
<a th:href="@{${moments.nextUrl}}">
<span>下一页</span>
</a>
</div>
</div>
<script>heo.reflashEssayWaterFall();</script>
<hr/>