Merge pull request #130 from jiewenhuang/dev

update:v1.1.5
jiewenhuang · Nov 8, 2023 · b3f9b51 · b3f9b51
2 parents 6126da0 + fd295b3
commit b3f9b51
Show file tree

Hide file tree

Showing 29 changed files with 529 additions and 497 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "halo-theme-joe3.0",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Theme of Halo2",
   "devDependencies": {
     "uglify-js": "^3.17.4"

diff --git a/settings.yaml b/settings.yaml
@@ -25,8 +25,8 @@ spec:
           name: comment_option
           id: comment_option
           value: default
-          label: 开启浅色模式背景图
-          help: "需要配置好浅色模式背景图后才有效"
+          label: 评论系统
+          help: "选择使用的评论系统"
           options:
             - value: default
               label: 默认
@@ -1504,6 +1504,8 @@ spec:
                   label: 最新评论
                 - value: "enable_tag_cloud"
                   label: 标签云
+                - value: "enable_ads_aside"
+                  label: 侧边栏广告
         - $formkit: code
 #          if: "$get(template_aside).value === 'enable_notice'"
           name: site_notice
@@ -2221,6 +2223,86 @@ spec:
           label: 底部显示内容
           value: ""
           language: html
+    - group: ads
+      label: 广告
+      formSchema:
+        - $formkit: radio
+          name: enable_aside_ads
+          label: 是否启用侧边栏广告
+          value: false
+          help: "启用后需要再到侧边栏添加组件"
+          options:
+            - value: true
+              label: 是
+            - value: false
+              label: 否
+        - $formkit: attachment
+          name: aside_ads_img
+          label: 侧边栏广告图片
+          value: ""
+          help: "侧边栏广告图片链接"
+        - $formkit: text
+          name: aside_ads_url
+          label: 广告链接
+          value: ""
+          help: "广告跳转链接"
+        - $formkit: radio
+          name: enable_post_ads_top
+          label: 是否启用文章顶部广告
+          value: false
+          options:
+            - value: true
+              label: 是
+            - value: false
+              label: 否
+        - $formkit: attachment
+          name: post_ads_top_img
+          label: 文章顶部广告图片
+          value: ""
+          help: "文章顶部广告图片链接"
+        - $formkit: text
+          name: post_ads_top_url
+          label: 广告链接
+          value: ""
+          help: "广告跳转链接"
+        - $formkit: radio
+          name: enable_post_ads_bottom
+          label: 是否启用文章底部广告
+          value: false
+          options:
+            - value: true
+              label: 是
+            - value: false
+              label: 否
+        - $formkit: attachment
+          name: post_ads_bottom_img
+          label: 文章底部广告图片
+          value: ""
+          help: "文章底部广告图片链接"
+        - $formkit: text
+          name: post_ads_bottom_url
+          label: 广告链接
+          value: ""
+          help: "广告跳转链接"
+        - $formkit: radio
+          name: enable_post_ads_aside
+          label: 是否启用文章侧边栏广告
+          value: false
+          options:
+            - value: true
+              label: 是
+            - value: false
+              label: 否
+        - $formkit: attachment
+          name: post_ads_aside_img
+          label: 文章侧边栏广告图片
+          value: ""
+          help: "文章底部广告图片链接"
+        - $formkit: text
+          name: post_ads_aside_url
+          label: 广告链接
+          value: ""
+          help: "广告跳转链接"
 
     - group: footer
       label: 页脚

diff --git a/templates/assets/css/beauty.less b/templates/assets/css/beauty.less
@@ -220,5 +220,151 @@
   50% { transform: translateY(15px); }
   100% { transform: translateY(0); }
 }
-
 .parallax > use{animation: move-forever 12s linear infinite;}.parallax > use:nth-child(1){animation-delay: -2s;}.parallax > use:nth-child(2){animation-delay: -2s; animation-duration: 5s;}.parallax > use:nth-child(3){animation-delay: -4s; animation-duration: 3s;}@keyframes move-forever{0%{transform: translate(-90px, 0%);} 100%{transform: translate(85px, 0%);}}.evan-big-banner_bottom{width: 100%;height: 40px;position: relative;overflow: hidden;z-index: 1;background: var(--footer-bg);}.editorial{display: block; width: 100%; height: 40px; margin: 0;}
+
+.evan-friends {
+  // 其他相关样式...
+
+  .sub-text {
+    word-break: break-all;
+    display: -webkit-box;
+    -webkit-line-clamp: 1;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .evan-f-left {
+    width: 100px;
+    min-width: 100px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.5s ease-in-out;
+
+    .f-avatar {
+      width: 70px;
+      height: 70px;
+      box-sizing: border-box;
+      border-radius: 50%;
+      overflow: hidden;
+      transition: all 0.2s ease-in-out;
+      border: 2px solid #ffffff;
+      background-color: #ffffff;
+
+      .avatar {
+        width: 100%;
+        height: 100%;
+        border-radius: 50%;
+        margin: 0;
+        object-fit: cover;
+      }
+    }
+  }
+
+  .evan-f-right {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    box-sizing: border-box;
+  }
+
+  .joe_detail__friends-item {
+    .contain {
+      border-radius: 12px;
+
+      .title::after {
+        display: none;
+      }
+
+      .content {
+        .desc {
+          -webkit-line-clamp: 1;
+        }
+      }
+    }
+  }
+
+  .title {
+    min-width: 70%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-weight: 700;
+    font-size: 1.3em;
+    color: var(--fcolor);
+    margin-top: 12px;
+
+    .icon {
+      position: absolute;
+      top: -1.6em;
+      right: calc(50% - 1.5em);
+      width: 1em;
+      min-width: 1em;
+      height: 1em;
+      min-height: 1em;
+      overflow: hidden;
+      font-size: 20px;
+      border-radius: 50%;
+      border: 1px solid #ffffff;
+      background-color: #ffffff;
+    }
+  }
+
+  .content {
+    margin-top: 10px !important;
+    font-size: 0.93em;
+    color: var(--main);
+  }
+
+  .contain {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    position: relative;
+    border: 1px solid var(--fcolor);
+    transition: all .2s ease-in-out;
+
+    &:hover {
+      transform: translateY(-3px);
+      box-shadow: 0px 0px 20px -5px rgb(158 158 158 / 20%);
+    }
+
+    &::before {
+      content: "";
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      right: 0;
+      z-index: -1;
+      background-color: var(--fcolor) !important;
+      transform: scale(0);
+      transition: all 0.5s ease-in-out;
+      transform-origin: right bottom;
+      border-bottom-left-radius: 12px;
+    }
+
+    &:hover .f-avatar {
+      transform: scale(1.1);
+      box-shadow: 0px 2px 12px rgba(255, 255, 255, .5);
+    }
+  }
+}
+
+@media (max-width: 768px) {
+  .evan-friends {
+    .contain {
+      border-color: #ebeef5;
+
+      &:hover {
+        border-color: var(--fcolor);
+        box-shadow: 0px 0px 20px -5px rgb(158 158 158 / 20%);
+      }
+    }
+  }
+}
+
+
diff --git a/templates/assets/css/global.less b/templates/assets/css/global.less
@@ -6580,6 +6580,44 @@ body {
     z-index: 90;
   }
 }
+//登入按钮样式
+.nav_login {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 34px;
+  //background-color: var(--theme); // 你可以用LESS变量替换这里
+  //margin-right: 10px;
+  margin-left: 15px;
+
+  a {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 30px;
+    height: 30px;
+    border-radius: 50%;
+    background-color: #f2f2f2;
+    color: #333;
+    text-decoration: none;
+    font-size: 24px;
+    transition: background-color 0.3s, color 0.3s;
+
+    &:hover {
+      background-color: var(--theme); // 这里的变量可以是LESS的全局变量
+      color: #f2f2f2;
+    }
+  }
+
+  img {
+    width: 30px;
+    height: 30px;
+    border-radius: 50%;
+    object-fit: cover;
+    overflow: hidden;
+  }
+}
+
 
 .blur-up {
   filter: blur(5px) !important;

diff --git a/templates/assets/css/journals.less b/templates/assets/css/journals.less
@@ -269,6 +269,19 @@
             transition: transform 0.35s, opacity 0.35s;
           }
         }
+        a[href*="tag"] {
+          color: var(--theme);
+          cursor: pointer;
+          background-color: var(--classD);
+          padding: 1px 4px;
+          border-radius: 3px;
+          display: inline-block;
+          white-space: nowrap;
+
+          &::before {
+            content: "#";
+          }
+        }
 
         ins,
         del {

diff --git a/templates/assets/css/min/beauty.min.css b/templates/assets/css/min/beauty.min.css
diff --git a/templates/assets/css/min/global.min.css b/templates/assets/css/min/global.min.css