Merge pull request #22 from zsjy/dev

Dev

.github/workflows/build.yml

@@ -7,6 +7,7 @@ on:
   push:
     branches: [ "master", "dev" ]
     paths: ["theme.yaml"]
+  workflow_dispatch:
   
 jobs:
   build:
@@ -50,16 +51,15 @@ jobs:
     - name: Build
       run: npm run actions --tag=${{ env.version }}
 
-      # 上传构建产物zip
+#      # 上传构建产物zip
-    - name: Upload artifacts
+#    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+#      uses: actions/upload-artifact@v4
-      with:
+#      with:
-        name: halo-theme-dream2.0-plus
+#        name: halo-theme-dream2.0-plus
-        path: dist-actions
+#        path: dist-actions
 
-    # 如果是master分支，创建Release
+    # 如果是master分支，创建latest的Release，否则创建 预览版
     - name: Create Release
-      if: ${{ env.branch_type == 'master' }}
       id: create_release
       uses: actions/create-release@latest
       env:
@@ -69,23 +69,11 @@ jobs:
         release_name: ${{ env.version }}
         body: ${{ github.event.commits[0].message }}
         draft: false
-        prerelease: false
+        prerelease: ${{ env.branch_type != 'master' }}
 
-    # # 如果是master分支，创建Release Asset
+    # 创建Release Asset
-    # - name: Upload Release Asset
-    #   if: ${{ env.branch_type == 'master' }}
-    #   uses: dwenegar/upload-release-assets@v1
-    #   env:
-    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    #   with:
-    #     release_id: ${{ steps.create_release.outputs.id }}
-    #     assets_path: |
-    #       dist
-
-    # 如果是master分支，创建Release Asset
     - name: Upload Release Asset
       id: upload_asset
-      if: ${{ env.branch_type == 'master' }}
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gitea-build.yml

@@ -50,16 +50,15 @@ jobs:
     - name: Build
       run: npm run actions --tag=${{ env.version }}
 
-      # 上传构建产物zip
+#      # 上传构建产物zip
-    - name: Upload artifacts
+#    - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+#      uses: actions/upload-artifact@v3
-      with:
+#      with:
-        name: halo-theme-dream2.0-plus
+#        name: halo-theme-dream2.0-plus
-        path: dist-actions
+#        path: dist-actions
 
-    # 如果是master分支，创建Release
+    # 如果是master分支，创建latest的Release，否则创建 预览版
     - name: Create Release
-      if: ${{ env.branch_type == 'master' }}
       id: create_release
       uses: actions/create-release@latest
       env:
@@ -69,4 +68,4 @@ jobs:
         release_name: ${{ env.version }}
         body: ${{ github.event.commits[0].message }}
         draft: false
-        prerelease: false
+        prerelease: ${{ env.branch_type != 'master' }}

src/css/style.less

@@ -5231,6 +5231,7 @@ button.swiper-pagination-bullet {
       padding: 0.6rem;;
       border-radius: var(--radius-inner) 0 0 var(--radius-inner);
       border: var(--theme) 1px solid;
+      color: var(--main);
     }
 
     .search-form-btn {
@@ -5274,7 +5275,6 @@ button.swiper-pagination-bullet {
     color: var(--main);
 
     &-tips {
-      max-width: 60%;
       margin: 0;
     }
   }

templates/search.html

@@ -14,6 +14,7 @@
                   class="text-input"
                   type="search"
                   name="keyword"
+                  th:title="${theme.config.page_config.search.search_placeholder}"
                   th:placeholder="${theme.config.page_config.search.search_placeholder}"
                   th:value="${searchResult.keyword}"
                   required

theme.yaml

@@ -30,7 +30,7 @@ spec:
   settingName: theme-dream2-plus-setting
   configMapName: theme-dream2-plus-configMap
   # 版本号
-  version: 1.2.6.1
+  version: 1.2.6.beta2
   # 最低支持的 Halo 版本
   require: ">=2.15.0"
   # 许可