Merge pull request #152 from yundabei/main

修复控制台因非本地环境报错undefined
修复瞬时信息不显示博主名称 #84
修复文章页导航显示不全 #66
修复waline评论的gif功能导致footer元素异常 #141
新增PC端等级显示
版本号+1

templates/assets/css/global.less

@@ -5670,6 +5670,7 @@ body {
   color: var(--minor);
   background: var(--background);
   border-top: 1px solid var(--classD);
+  z-index: -1;
 
   .joe_container {
     position: relative;

templates/assets/css/post.less

@@ -249,7 +249,7 @@
   }
 
   .is-collapsible {
-    max-height: 1000px;
+    // max-height: 1000px;
     overflow: hidden;
     transition: all 300ms ease-in-out;
   }
@@ -526,4 +526,12 @@
   0% {
     box-shadow: 0 0 0 0 var(--theme);
   }
+}
+// 评论区 GIF 位置及大小调整
+.wl-gif-popup.display{
+  bottom: 100% !important;
+  top:auto !important;
+}
+.wl-gallery{
+  max-height: 30vh !important;
 }

templates/modules/common/blogger.html

@@ -15,8 +15,7 @@
         </th:block>
     </div>
     <a class="link" th:href="${site.url}" target="_blank" rel="noopener noreferrer nofollow">
-        [[${theme.config.blogger.nickname ?: site.title}]]
-<!--      这里应该还有一个等级-->
+        [[${theme.config.blogger.nickname ?: site.title}]]<img class="level" th:src="@{/assets/svg/level_1.svg}"  alt="博主等级">
     </a>
     <th:block th:if="${theme.config.blogger.motto != ''}">
     <p class="motto joe_motto">[[${theme.config.blogger.motto}]]</p>

templates/modules/config.html

@@ -30,8 +30,8 @@
 <script id="theme-config-getter" type="text/javascript">
     if (window.location.hostname === 'localhost'||window.location.hostname === '127.0.0.1') {
         ThemeConfig['mode'] = "development"
+        console.log(ThemeConfig.mode)
     }
-    console.log(ThemeConfig.mode)
 
     if (ThemeConfig.mode === "development") {
         console.log("Joe3主题配置：", ThemeConfig);

templates/moments.html

@@ -20,7 +20,8 @@
             <img width="35" height="35" class="avatar lazyload" th:data-src="${theme.config.blogger.avatar}" th:src="${theme.config.blogger.lazyload_avatar}"  th:alt="${moment.owner.displayName}">
             <div class="meta">
               <div class="author">
-                <a class="link" th:href="@{authors}+'/'+${moment.owner.name}" th:title="${moment.owner.displayName}">[[${moment.owner.displayName}]]</a>
+                <a class="link" th:href="${site.url}" th:title="${theme.config.blogger.nickname ?: site.title}">[[${theme.config.blogger.nickname ?: site.title}]]</a>
+                <!-- 修改链接指向博客地址 title 和 显示为博主名/博客名 -->
               </div>
               <div class="item">
                 <span class="text">[[${theme.config.blogger.motto?:'一句话介绍自己吧！'}]]</span>

theme.yaml

@@ -13,7 +13,7 @@ spec:
   repo: "https://github.com/jiewenhuang/halo-theme-joe3.0"
   settingName: "theme-Joe-setting"
   configMapName: "theme-Joe-configMap"
-  version: "1.1.6"
+  version: "1.1.7"
   require: ">=2.8.0"
   customTemplates:
     page: