更新

assets/css/joe.global.scss

@@ -2539,17 +2539,27 @@
             .foot {
                 position: relative;
                 display: flex;
+                align-items: center;
                 justify-content: space-between;
                 padding: 0 15px 15px;
                 .owo {
-					.seat {
+                    min-height: 32px;
-						color: var(--routine);
+                    padding-top: 3px;
-                        height: 100%;
+                    .seat {
-						display: flex;
+                        text-align: center;
-						align-items: center;
+                        color: var(--routine);
-					}
+                        height: 26px;
+                        line-height: 26px;
+                        background: var(--background);
+                        opacity: 0.85;
+                        border-radius: 13px;
+                        width: 70px;
+                    }
                 }
                 .submit {
+                    position: absolute;
+                    top: 0;
+                    right: 15px;
                     white-space: nowrap;
                     .cancle {
                         display: none;
@@ -2718,40 +2728,21 @@
             cursor: pointer;
         }
         .box {
-            position: absolute;
+            width: 100%;
-            left: 0;
+            display: none;
-            width: 300px;
             background: var(--background);
-            box-shadow: var(--box-shadow);
             border-radius: var(--radius-inner);
             overflow: hidden;
-            visibility: hidden;
+            margin-top: 15px;
-            transform: scale(0.5);
-            border: 1px solid var(--classD);
-            opacity: 0;
-            transition: visibility, 0.35s, opacity 0.35s, transform 0.35s;
-            &.show {
-                visibility: visible;
-                transform: scale(1);
-                opacity: 1;
-            }
             .scroll {
                 display: none;
                 max-height: 200px;
                 overflow-y: auto;
                 overscroll-behavior: none;
                 padding: 5px;
-                &:nth-child(3) .item {
-                    text-align: center;
-                    white-space: nowrap;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    width: 50%;
-                    user-select: none;
-                    color: var(--routine);
-                }
                 .item {
-                    width: 20%;
+                    text-align: center;
+                    width: calc(100% / 18);
                     display: inline-block;
                     padding: 5px;
                     cursor: pointer;
@@ -2765,19 +2756,26 @@
                         background: var(--classD);
                     }
                 }
+                &:nth-child(3) {
+                    .item {
+                        color: var(--routine);
+                        width: calc(100% / 5);
+                    }
+                }
             }
             .bar {
                 display: flex;
                 align-items: center;
-                border-top: 1px solid var(--classD);
+                border-top: 1px solid var(--classC);
                 .item {
                     line-height: 30px;
                     padding: 0 10px;
                     cursor: pointer;
                     color: var(--routine);
-                    transition: background 0.25s;
+                    transition: background 0.25s, color 0.25s;
                     &.active {
-                        background: var(--classD);
+                        color: #fff;
+                        background: var(--theme);
                     }
                 }
             }
@@ -2785,7 +2783,6 @@
     }
 }
 
-
 .profile-color-modes-illu-frame {
     opacity: 0;
 }

assets/js/joe.owo.js

@@ -39,18 +39,18 @@ class JoeOwO {
     initEvent() {
         /* 容器 */
         const contain = this.options.contain;
-        const height = $(contain).height();
 
         /* 点击页面关闭 */
         $(document).on('click', function () {
-            $(contain + ' .box').removeClass('show');
+            const box = contain + ' .box';
+            $(box).stop().slideUp('fast');
         });
 
         /* 点击占位符，显示表情弹窗 */
         const seat = contain + ' .seat';
         $(seat).on('click', function (e) {
             e.stopPropagation();
-            $(this).siblings('.box').css('top', height).toggleClass('show');
+            $(this).siblings('.box').stop().slideToggle('fast');
         });
 
         /* 点击tab栏，切换表情类型 */

assets/json/joe.owo.json

@@ -70,7 +70,8 @@
             { "icon": "<img alt=\"表情\" src=\"/usr/themes/Joe/assets/owo/paopao/E591BC_2x.png\">", "data": "::(呼)", "text": "呼" },
             { "icon": "<img alt=\"表情\" src=\"/usr/themes/Joe/assets/owo/paopao/E586B7_2x.png\">", "data": "::(冷)", "text": "冷" },
             { "icon": "<img alt=\"表情\" src=\"/usr/themes/Joe/assets/owo/paopao/E7949FE6B094_2x.png\">", "data": "::(生气)", "text": "生气" },
-            { "icon": "<img alt=\"表情\" src=\"/usr/themes/Joe/assets/owo/paopao/E5BCB1_2x.png\">", "data": "::(弱)", "text": "弱" }
+            { "icon": "<img alt=\"表情\" src=\"/usr/themes/Joe/assets/owo/paopao/E5BCB1_2x.png\">", "data": "::(弱)", "text": "弱" },
+            { "icon": "<img alt=\"表情\" src=\"/usr/themes/Joe/assets/owo/paopao/E78B97E5A4B4_2x.png\">", "data": "::(狗头)", "text": "狗头" }
         ]
     },
     "阿鲁": {

assets/owo/paopao/list.txt

@@ -1,72 +0,0 @@
-E4B88DE9AB98E585B4_2x.png
-E4B996_2x.png
-E4BDA0E68782E79A84_2x.png
-E4BEBFE4BEBF_2x.png
-E586B7_2x.png
-E58B89E5BCBA_2x.png
-E59083E7939C_2x.png
-E59083E7BF94_2x.png
-E59090E8888C_2x.png
-E59090_2x.png
-E59180E592A9E788B9_2x.png
-E591B5E591B5_2x.png
-E591BC_2x.png
-E592A6_2x.png
-E59388E59388_2x.png
-E5958A_2x.png
-E596B7_2x.png
-E5989AE7919F_2x.png
-E5A4A7E68B87E68C87_2x.png
-E5A4AAE5BC80E5BF83_2x.png
-E5A4AAE998B3_2x.png
-E5A794E5B188_2x.png
-E5B08FE4B996_2x.png
-E5B08FE7BAA2E884B8_2x.png
-E5BC80E5BF83_2x.png
-E5BCB1_2x.png
-E5BDA9E899B9_2x.png
-E5BF83E7A28E_2x.png
-E68092_2x.png
-E6838AE593AD_2x.png
-E6838AE68190_2x.png
-E6838AE8AEB6_2x.png
-E68792E5BE97E79086_2x.png
-E6898BE7BAB8_2x.png
-E68C96E9BCBB_2x.png
-E68D82E598B4E7AC91_2x.png
-E6989FE6989FE69C88E4BAAE_2x.png
-E6B197_2x.png
-E6B299E58F91_2x.png
-E6B3AA_2x.png
-E6BB91E7A8BD_2x.png
-E781AFE6B3A1_2x.png
-E788B1E5BF83_2x.png
-E78A80E588A9_2x.png
-E78B82E6B197_2x.png
-E78EABE791B0_2x.png
-E7949FE6B094_2x.png
-E79691E997AE_2x.png
-E79C9FE6A392_2x.png
-E79DA1E8A789_2x.png
-E7A4BCE789A9_2x.png
-E7AC91E5B0BF_2x.png
-E7AC91E79CBC_2x.png
-E7BAA2E9A286E5B7BE_2x.png
-E8839CE588A9_2x.png
-E88AB1E5BF83_2x.png
-E88CB6E69DAF_2x.png
-E88DAFE4B8B8_2x.png
-E89B8BE7B395_2x.png
-E89CA1E7839B_2x.png
-E98499E8A786_2x.png
-E985B7_2x.png
-E985B8E788BD_2x.png
-E992B1E5B881_2x.png
-E992B1_2x.png
-E998B4E999A9_2x.png
-E99FB3E4B990_2x.png
-E9A699E89589_2x.png
-E9BB91E7BABF_2x.png
-haha_2x.png
-OK_2x.png
-what_2x.png

core/function.php

@@ -3,7 +3,7 @@
 /* 获取主题当前版本号 */
 function _getVersion()
 {
-    return "5.2.0";
+    return "5.2.1";
 };
 
 /* 判断是否是手机 */

core/parse.php

@@ -15,7 +15,7 @@ function _parseCommentReply($text)
 function _parseReply($text)
 {
     $text = preg_replace_callback(
-        '/\:\:\(\s*(呵呵|哈哈|吐舌|太开心|笑眼|花心|小乖|乖|捂嘴笑|滑稽|你懂的|不高兴|怒|汗|黑线|泪|真棒|喷|惊哭|阴险|鄙视|酷|啊|狂汗|what|疑问|酸爽|呀咩爹|委屈|惊讶|睡觉|笑尿|挖鼻|吐|犀利|小红脸|懒得理|勉强|爱心|心碎|玫瑰|礼物|彩虹|太阳|星星月亮|钱币|茶杯|蛋糕|大拇指|胜利|haha|OK|沙发|手纸|香蕉|便便|药丸|红领巾|蜡烛|音乐|灯泡|开心|钱|咦|呼|冷|生气|弱|吐血)\s*\)/is',
+        '/\:\:\(\s*(呵呵|哈哈|吐舌|太开心|笑眼|花心|小乖|乖|捂嘴笑|滑稽|你懂的|不高兴|怒|汗|黑线|泪|真棒|喷|惊哭|阴险|鄙视|酷|啊|狂汗|what|疑问|酸爽|呀咩爹|委屈|惊讶|睡觉|笑尿|挖鼻|吐|犀利|小红脸|懒得理|勉强|爱心|心碎|玫瑰|礼物|彩虹|太阳|星星月亮|钱币|茶杯|蛋糕|大拇指|胜利|haha|OK|沙发|手纸|香蕉|便便|药丸|红领巾|蜡烛|音乐|灯泡|开心|钱|咦|呼|冷|生气|弱|吐血|狗头)\s*\)/is',
         function ($match) {
             return '<img class="owo_image lazyload" src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" data-src="/usr/themes/Joe/assets/owo/paopao/' . str_replace('%', '', urlencode($match[1])) . '_2x.png" onerror="javascript: this.src=\'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==\';" alt="表情"/>';
         },

public/include.php

@@ -52,8 +52,8 @@
 <!-- 全局公用CSS（静态资源放在了CDN上，如果你的服务器带宽不够，请不要修改成本地，cdn采用jsdelivr放心不会失效） -->
 <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.mode.css'); ?>">
 <link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.normalize.css'); ?>">
-<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.global.css?v=666'); ?>">
+<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.global.css?v=686'); ?>">
-<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.responsive.css?v=666'); ?>">
+<link rel="stylesheet" href="<?php $this->options->themeUrl('assets/css/joe.responsive.css?v=686'); ?>">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/qmsg/qmsg.css" />
 <link rel="stylesheet" href="https://apip.weatherdt.com/standard/static/css/weather-standard.css">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.css" />
@@ -66,8 +66,8 @@
 <script src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/sketchpad/joe.sketchpad.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/@fancyapps/fancybox@3.5.7/dist/jquery.fancybox.min.js"></script>
 <script src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/qmsg/qmsg.js"></script>
-<script src="<?php $this->options->themeUrl('assets/js/joe.owo.js'); ?>"></script>
+<script src="<?php $this->options->themeUrl('assets/js/joe.owo.js?v=686'); ?>"></script>
-<script src="<?php $this->options->themeUrl('assets/js/joe.global.js?v=666'); ?>"></script>
+<script src="<?php $this->options->themeUrl('assets/js/joe.global.js?v=686'); ?>"></script>
 <!-- 异步加载的JS -->
 <script async src="https://apip.weatherdt.com/standard/static/js/weather-standard.js?v=2.0"></script>
 <script async src="https://cdn.jsdelivr.net/gh/HaoOuBa/Joe@master/plugin/smooth/joe.smooth.js"></script>