Merge branch 'release' into staging

6036ff9a3cc0ef26185d0e7dce42445df5d87c9b

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: d25d97ad5de40b05f5d95aafc8fddb54e59d52fe eb48c5abe2727d8f6b2f94da1ebd1f2164bf93b6
2 files changed, +5 -1Showing whitespace changes
public/script.js+1 -1
@@ -2145,7 +2145,7 @@ export function appendMediaToMessage(mes, messageElement, scrollBehavior = SCROL
2145 // Set media display attribute2145 // Set media display attribute
2146 messageElement.attr('data-media-display', mediaDisplay);2146 messageElement.attr('data-media-display', mediaDisplay);
2147 // Toggle text visibility2147 // Toggle text visibility
2148 messageElement.find('.mes_text').toggleClass('displayNone', hideMessageText);2148 messageElement.find('.mes_text').toggleClass('inline_media', hideMessageText);
21492149
2150 /**2150 /**
2151 * Appends a single image attachment to the message element.2151 * Appends a single image attachment to the message element.
public/style.css+4 -0
@@ -1508,6 +1508,10 @@ body.hideAllSwipeButtons :is(.swipe_left, .swipe_right),
1508 opacity: 0.4;1508 opacity: 0.4;
1509}1509}
15101510
1511.mes_text.inline_media:not(:has(.edit_textarea)) {
1512 display: none;
1513}
1514
1511br {1515br {
1512 display: block;1516 display: block;
1513 margin: 2px 0;1517 margin: 2px 0;