⬆️ 升级bootstrap版本为5.2

assets/js/puock.js

@@ -70,7 +70,7 @@ class Puock {
         this.eventPostMainBoxResize()
         this.swiperOnceEvent()
         this.initModalToggle()
-        layer.config({shade:0.5})
+        layer.config({shade: 0.5})
     }
 
     pageInit() {
@@ -396,7 +396,9 @@ class Puock {
         if (this.data.params.use_post_menu) {
             this.generatePostMenuHTML()
         }
-        $('[data-toggle="tooltip"]').tooltip({placement: 'auto', trigger: 'hover'});
+        [...document.querySelectorAll('[data-toggle="tooltip"]')].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl, {
+            placement: 'bottom', trigger: 'hover'
+        }))
         $(".entry-content").viewer({
             navbar: false,
             url: this.data.params.main_lazy_img ? 'data-src' : 'src'
@@ -1096,8 +1098,13 @@ class Puock {
 
 }
 
-$(() => {
-    window.Puock = new Puock()
-    window.Puock.onceInit()
-})
+$(
+    () => {
+        window
+            .Puock = new Puock()
+        window
+            .Puock
+            .onceInit()
+    }
+)
 

assets/style/common.less

@@ -2,13 +2,18 @@
 
 a {
   color: var(--pk-c-primary);
+  text-decoration: none;
 }
 
 .wh100 {
   width: 100%;
   height: 100%;
 }
 
+.form-group {
+  margin-bottom: 1rem;
+}
+
 .text-2line {
   overflow: hidden;
   text-overflow: ellipsis;
@@ -116,6 +121,10 @@ a {
   text-align: right;
 }
 
+.ml-1 {
+  margin-left: 0.25rem !important;
+}
+
 .--dynamic-distance(@pre,@attr,@step,@start,@end) when (@start<=@end) {
   .--dynamic-distance(@pre, @attr, @step, @start + @step, @end);
   .@{pre}@{start} {
@@ -133,14 +142,14 @@ a {
 
 .--each-btn(@i:1) when (@i =< length(@colors)) {
   @item: extract(@colors, @i);
-  .btn-@{item},.btn-@{item}:hover {
+  .btn-@{item}, .btn-@{item}:hover {
     background-color: ~"var(--pk-c-@{item})" !important;
     color: var(--pk-c-light);
     border-color: ~"var(--pk-c-@{item})" !important;
   }
-  .btn-@{item}:hover:hover{
-     opacity: .8;
-   }
+  .btn-@{item}:hover:hover {
+    opacity: .8;
+  }
   .--each-btn(@i+1);
 }
 
@@ -196,6 +205,16 @@ a {
   }
 }
 
+.form-check-input:checked {
+}
+
+.form-check-input {
+  &:checked {
+    background-color: var(--pk-c-primary) !important;
+    border-color: var(--pk-c-primary) !important;
+  }
+}
+
 .btn {
   transition: all .3s;
 
@@ -329,7 +348,7 @@ a {
   }
 }
 
-.p-flex-center{
+.p-flex-center {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -444,11 +463,12 @@ a {
   }
 }
 
-.t-separator{
-  display:flex;
+.t-separator {
+  display: flex;
   justify-content: center;
   align-items: center;
-  &:before,&:after{
+
+  &:before, &:after {
     flex: 1;
     content: "";
     background: var(--pk-c-border);
@@ -458,18 +478,20 @@ a {
   }
 }
 
-.pk-badge{
+.pk-badge {
   display: inline-block;
   padding: 5px 10px;
   cursor: pointer;
   border-radius: 2px;
   background-color: var(--pk-bg-box-content);
   color: var(--pk-c-sub) !important;
-  &:hover{
+
+  &:hover {
     background-color: var(--pk-c-primary);
     color: var(--pk-c-light) !important;
   }
-  &.pk-badge-sm{
+
+  &.pk-badge-sm {
     padding: 3px 6px;
     font-size: 12px;
   }

assets/style/style.less

@@ -606,6 +606,11 @@ body.pre-mac pre {
         .fs16;
       }
 
+      & > button {
+        border: none;
+        background: transparent;
+      }
+
       .close {
         i {
           display: inline-block;
@@ -640,7 +645,7 @@ a:hover {
 }
 
 .btn:hover,
-.btn:focus, .form-control:hover, .form-control:focus, button:focus, .abc-checkbox label:focus {
+.btn:focus, .form-control:hover, .form-control:focus, button:focus, .abc-checkbox label:focus,.form-check-input:focus {
   outline: none;
   box-shadow: none;
 }
@@ -1420,7 +1425,7 @@ a:hover {
 #search {
   position: fixed;
   top: 90px;
-  z-index: 1041;
+  z-index: 9999;
   width: 100%;
 
   #search-main {

footer.php

@@ -4,7 +4,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title puock-text" id="infoToastTitle"></h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true"><i class="fa fa-close t-md"></i></span>
                 </button>
             </div>

gulpfile.js

@@ -26,7 +26,10 @@ gulp.task('style', function () {
 
 gulp.task('lib_style', function () {
     return gulp.src(_libs_style)
-        .pipe(concatCss("libs.min.css"))
+        .pipe(concatCss("libs.min.css",{
+            // inlineImports:false,
+            rebaseUrls:false
+        }))
         .pipe(minifyCSS({
             format: 'keep-breaks',
             semicolonAfterLastProperty: true,

inc/ajax/page-front-login.php

@@ -235,8 +235,9 @@ class="form-control form-control-sm t-sm" name="vd"
                     </div>
                 </div>
             <?php endif; ?>
-            <div class="mb15">
-                <label><input type="checkbox" name="remember"> 记住我</label>
+            <div class="mb15 form-check form-switch">
+                <input class="form-check-input" name="remember" type="checkbox" role="switch" id="front-login-remember-me">
+                <label class="form-check-label" for="front-login-remember-me"> 记住我</label>
             </div>
             <div class="mb15 d-flex justify-content-center wh100">
                 <button class="btn btn-ssm btn-primary mr5" type="submit"><i class="fa fa-right-to-bracket"></i> 立即登录

templates/module-reward.php

@@ -5,7 +5,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title puock-text">打赏</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true"><i class="fa fa-close t-md"></i></span>
                     </button>
                 </div>

templates/module-smiley.php

@@ -4,7 +4,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title puock-text">选择表情</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true"><i class="fa fa-close t-md"></i></span>
                 </button>
             </div>

templates/post-actions.php

@@ -6,10 +6,10 @@
                 <i class="fa-regular fa-thumbs-up t-md"></i>&nbsp;<span
                         class="t-sm"><?php echo get_post_meta($post->ID, 'puock_like', true) ?></span></div>
             <?php if (pk_is_checked('post_reward')): ?>
-                <div class="circle-button puock-bg text-center" data-toggle="modal" data-target="#rewardModal">
+                <div class="circle-button puock-bg text-center" data-bs-toggle="modal" data-bs-target="#rewardModal">
                     <span>赏</span></div>
             <?php endif; ?>
-            <div class="circle-button puock-bg text-center" data-toggle="modal" data-target="#shareModal"><i
+            <div class="circle-button puock-bg text-center" data-bs-toggle="modal" data-bs-target="#shareModal"><i
                         class="fa fa-share-from-square t-md"></i></div>
             <?php if(pk_is_checked('post_poster_open')):?>
             <div class="circle-button puock-bg text-center pk-modal-toggle"

templates/post-share.php

@@ -4,7 +4,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title puock-text"><?php _e('分享至', PUOCK) ?></h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true"><i class="fa fa-close t-md"></i></span>
                 </button>
             </div>