修复鼠标风格样式加载位置不正确的问题

zsjy · May 17, 2024 · 3756136 · 3756136
1 parent aa8fa1e
commit 3756136
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 22 deletions.
diff --git a/src/css/cursor.less b/src/css/cursor.less
@@ -15,10 +15,18 @@ a, button, .expand-done, .navbar-above .navbar-nav .item, .navbar-slideicon, .na
   cursor: @pointer !important;
 }
 
-.main-content :not(.jg-entry)>img:not([class]) {
+.main-content :not(.jg-entry) > img:not([class]) {
   cursor: @zoom-in;
 }
 
 p, input[type=text], blockquote, th, td, code, h1, h2, h3, h4, h5, h6, hr, li, textarea {
   cursor: @text;
-}
+}
+
+.wechat .flip-wrapper {
+  cursor: @default;
+}
+
+.wechat .flip-wrapper.pointer {
+  cursor: @pointer;
+}
diff --git a/src/css/style.less b/src/css/style.less
@@ -3252,14 +3252,8 @@ button.swiper-pagination-bullet {
       width: 100%;
       height: auto;
       z-index: 1;
-      cursor: var(--cursor-default);
-
-      &.pointer {
-        cursor: var(--cursor-pointer);
-      }
 
       &:hover .animation {
-        -webkit-transform: rotateY(180deg);
         transform: rotateY(180deg);
 
         .wechatBack {

diff --git a/src/css/theme.less b/src/css/theme.less
@@ -40,9 +40,6 @@ html {
   --radius-img: 5px;
   --box-shadow: 0 0px 10px -5px #949494;
 
-  --cursor-pointer: pointer;
-  --cursor-default: default;
-
   &.night {
     --theme: #5d93db;
     --main: #b0b0b0;

diff --git a/templates/assets/css/cursor.min.css b/templates/assets/css/cursor.min.css
diff --git a/templates/assets/css/style.min.css b/templates/assets/css/style.min.css
diff --git a/templates/assets/css/theme.min.css b/templates/assets/css/theme.min.css
diff --git a/templates/common/config.html b/templates/common/config.html
@@ -12,12 +12,12 @@
 
     html {
       --theme: [(${theme.config.basic_style.theme_color})];
-      [(${theme.config.enhance.cursor_style == 'breeze' ? '--cursor-default:url(/themes/theme-dream/assets/cursor/breeze/Arrow.cur),auto;--cursor-pointer:url(/themes/theme-dream/assets/cursor/breeze/Hand.cur),pointer;--cursor-text:url(/themes/theme-dream/assets/cursor/breeze/IBeam.cur),auto;--cursor-zoom-in:url(/themes/theme-dream/assets/cursor/breeze/Cross.cur),zoom-in;'
-      : theme.config.enhance.cursor_style == 'black_cat' ? '--cursor-default:url(/themes/theme-dream/assets/cursor/black_cat/normal.cur),auto;--cursor-pointer:url(/themes/theme-dream/assets/cursor/black_cat/ayuda.cur),pointer;--cursor-text:url(/themes/theme-dream/assets/cursor/black_cat/texto.cur),auto;--cursor-zoom-in:url(/themes/theme-dream/assets/cursor/black_cat/precision.cur),zoom-in;'
-      : theme.config.enhance.cursor_style == 'overwatch' ? '--cursor-default:url(/themes/theme-dream/assets/cursor/overwatch/pointer.cur),auto;--cursor-pointer:url(/themes/theme-dream/assets/cursor/overwatch/link.cur),pointer;--cursor-text:url(/themes/theme-dream/assets/cursor/overwatch/text.cur),auto;--cursor-zoom-in:url(/themes/theme-dream/assets/cursor/overwatch/cross.cur),zoom-in;'
-      : theme.config.enhance.cursor_style == 'rainbow_rain' ? '--cursor-default:url(/themes/theme-dream/assets/cursor/rainbow_rain/normal.cur),auto;--cursor-pointer:url(/themes/theme-dream/assets/cursor/rainbow_rain/link.cur),pointer;--cursor-text:url(/themes/theme-dream/assets/cursor/rainbow_rain/texto.cur),auto;--cursor-zoom-in:url(/themes/theme-dream/assets/cursor/rainbow_rain/precision.cur),zoom-in;'
-      : theme.config.enhance.cursor_style == 'marry' ? '--cursor-default:url(/themes/theme-dream/assets/cursor/marry/arrow.cur),auto;--cursor-pointer:url(/themes/theme-dream/assets/cursor/marry/arrow.cur),pointer;--cursor-text:url(/themes/theme-dream/assets/cursor/marry/beam.cur),auto;--cursor-zoom-in:url(/themes/theme-dream/assets/cursor/marry/move.cur),zoom-in;'
-      : theme.config.enhance.cursor_style != 'none' ? '--cursor-default: url(/themes/theme-dream/assets/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), auto;--cursor-pointer: url(/themes/theme-dream/assets/cursor/' + theme.config.enhance.cursor_style + '/hand.cur), pointer;--cursor-text: url(/themes/theme-dream/assets/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), auto;--cursor-zoom-in: url(/themes/theme-dream/assets/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), zoom-in;'
+      [(${theme.config.enhance.cursor_style == 'breeze' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/breeze/Arrow.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/breeze/Hand.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/breeze/IBeam.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/breeze/Cross.cur),zoom-in;'
+      : theme.config.enhance.cursor_style == 'black_cat' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/black_cat/normal.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/black_cat/ayuda.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/black_cat/texto.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/black_cat/precision.cur),zoom-in;'
+      : theme.config.enhance.cursor_style == 'overwatch' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/overwatch/pointer.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/overwatch/link.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/overwatch/text.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/overwatch/cross.cur),zoom-in;'
+      : theme.config.enhance.cursor_style == 'rainbow_rain' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/rainbow_rain/normal.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/rainbow_rain/link.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/rainbow_rain/texto.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/rainbow_rain/precision.cur),zoom-in;'
+      : theme.config.enhance.cursor_style == 'marry' ? '--cursor-default:url(/themes/theme-dream2-plus/assets/cursor/marry/arrow.cur),auto;--cursor-pointer:url(/themes/theme-dream2-plus/assets/cursor/marry/arrow.cur),pointer;--cursor-text:url(/themes/theme-dream2-plus/assets/cursor/marry/beam.cur),auto;--cursor-zoom-in:url(/themes/theme-dream2-plus/assets/cursor/marry/move.cur),zoom-in;'
+      : theme.config.enhance.cursor_style != 'none' ? '--cursor-default: url(/themes/theme-dream2-plus/assets/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), auto;--cursor-pointer: url(/themes/theme-dream2-plus/assets/cursor/' + theme.config.enhance.cursor_style + '/hand.cur), pointer;--cursor-text: url(/themes/theme-dream2-plus/assets/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), auto;--cursor-zoom-in: url(/themes/theme-dream2-plus/assets/cursor/' + theme.config.enhance.cursor_style + '/arrow.cur), zoom-in;'
       : ''})]
     }
 

diff --git a/theme.yaml b/theme.yaml
@@ -30,7 +30,7 @@ spec:
   settingName: theme-dream2-plus-setting
   configMapName: theme-dream2-plus-configMap
   # 版本号
-  version: 1.2.2.000000000028
+  version: 1.2.2.000004
   # 最低支持的 Halo 版本
   require: ">=2.12.0"
   # 许可

diff --git a/version b/version
@@ -1 +1 @@
-1.2.2
+1.2.1