pull changes
This commit is contained in:
parent
62434a06f1
commit
31ac41c354
5
.env
5
.env
@ -2,9 +2,14 @@ API_ID=1025907
|
||||
API_HASH=452b0359b988148995f22ff0f4229750
|
||||
VERSION=1.5.0
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
VERSION_FULL=1.5.0 (227)
|
||||
BUILD=227
|
||||
=======
|
||||
VERSION_FULL=1.5.0 (232)
|
||||
BUILD=232
|
||||
>>>>>>> eeb0f44ad... follow-up
|
||||
=======
|
||||
VERSION_FULL=1.5.0 (235)
|
||||
BUILD=235
|
||||
>>>>>>> 14f82665b... follow-up
|
||||
|
@ -742,7 +742,7 @@ export default function wrapRichText(text: string, options: Partial<{
|
||||
|
||||
const size = options.customEmojiSize || mediaSizes.active.customEmoji;
|
||||
const loadPromise = managers.appEmojiManager.getCachedCustomEmojiDocuments(docIds).then((docs) => {
|
||||
console.log(docs);
|
||||
// console.log(docs);
|
||||
if(middleware && !middleware()) return;
|
||||
|
||||
const loadPromises: Promise<any>[] = [];
|
||||
|
@ -617,6 +617,7 @@ $bubble-beside-button-width: 38px;
|
||||
|
||||
.attachment {
|
||||
--custom-emoji-size: var(--emoji-size);
|
||||
border-radius: 0 !important;
|
||||
|
||||
img.emoji {
|
||||
width: var(--emoji-size);
|
||||
@ -629,7 +630,7 @@ $bubble-beside-button-width: 38px;
|
||||
&:not(.sticker) {
|
||||
.attachment {
|
||||
padding-top: .5rem;
|
||||
padding-bottom: 1.5rem;
|
||||
padding-bottom: 1rem;
|
||||
//max-width: fit-content!important;
|
||||
max-height: fit-content!important;
|
||||
|
||||
|
@ -24,14 +24,11 @@
|
||||
|
||||
.media-sticker,
|
||||
.rlottie {
|
||||
margin: 0;
|
||||
width: inherit !important;
|
||||
height: inherit !important;
|
||||
}
|
||||
|
||||
.media-sticker.thumbnail {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
&-canvas {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
Loading…
x
Reference in New Issue
Block a user