Explorar o código

Single emoji rendering fixes.

* Make the emoji a little bit smaller
* Avoid scrollbar appearing for single emoji messages
* Also identify single sent emojis
JC Brand %!s(int64=6) %!d(string=hai) anos
pai
achega
77241bf5fe
Modificáronse 4 ficheiros con 7 adicións e 5 borrados
  1. 3 2
      css/converse.css
  2. 1 1
      dist/converse.js
  3. 2 1
      sass/_messages.scss
  4. 1 1
      src/headless/utils/emoji.js

+ 3 - 2
css/converse.css

@@ -11963,8 +11963,9 @@ body.converse-fullscreen {
     #conversejs .message.chat-msg .chat-msg__text .emojione {
     #conversejs .message.chat-msg .chat-msg__text .emojione {
       margin-bottom: -6px; }
       margin-bottom: -6px; }
   #conversejs .message.chat-msg .chat-msg__text--larger {
   #conversejs .message.chat-msg .chat-msg__text--larger {
-    font-size: 2em;
-    padding-top: 0.25em; }
+    font-size: 1.6em;
+    padding-top: 0.25em;
+    padding-bottom: 0.25em; }
   #conversejs .message.chat-msg .chat-msg__media {
   #conversejs .message.chat-msg .chat-msg__media {
     margin-top: 0.25rem;
     margin-top: 0.25rem;
     word-break: break-all; }
     word-break: break-all; }

+ 1 - 1
dist/converse.js

@@ -92319,7 +92319,7 @@ function convert(unicode) {
 }
 }
 
 
 _core__WEBPACK_IMPORTED_MODULE_2__["default"].isSingleEmoji = function (str) {
 _core__WEBPACK_IMPORTED_MODULE_2__["default"].isSingleEmoji = function (str) {
-  if (!str || str.length > 2) {
+  if (!str || str.length > 2 && !str.startsWith(':')) {
     return;
     return;
   }
   }
 
 

+ 2 - 1
sass/_messages.scss

@@ -178,8 +178,9 @@
             }
             }
 
 
             .chat-msg__text--larger {
             .chat-msg__text--larger {
-                font-size: 2em;
+                font-size: 1.6em;
                 padding-top: 0.25em;
                 padding-top: 0.25em;
+                padding-bottom: 0.25em;
             }
             }
 
 
             .chat-msg__media {
             .chat-msg__media {

+ 1 - 1
src/headless/utils/emoji.js

@@ -161,7 +161,7 @@ function convert (unicode) {
 }
 }
 
 
 u.isSingleEmoji = function (str) {
 u.isSingleEmoji = function (str) {
-    if (!str || str.length > 2) {
+    if (!str || (str.length > 2 && !str.startsWith(':'))) {
         return;
         return;
     }
     }
     const result = _.flow(u.shortnameToUnicode, twemoji.default.parse)(str)
     const result = _.flow(u.shortnameToUnicode, twemoji.default.parse)(str)