bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'chats-ff' into 'develop'

Browse source 
Chats: FireFox fixes

Closes #399

See merge request soapbox-pub/soapbox-fe!218
This commit is contained in:
Alex Gleason 2020-09-08 00:27:29 +00:00
commit 8c137b0c3c
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/soapbox/features/chats/components/chat_message_list.js
View file

Binary file not shown.

BIN
app/soapbox/reducers/chat_message_lists.js
View file

Binary file not shown.

21
app/styles/chats.scss
View file

@ -99,18 +99,12 @@
.chat-messages { .chat-messages {
overflow-y: scroll; overflow-y: scroll;
flex: 1; flex: 1;
display: flex;
flex-direction: column-reverse;
} }
.chat-message { .chat-message {
padding: 7px 10px; margin: 14px 10px;
display: flex; display: flex;
&:last-child {
padding-top: 14px;
}
&__bubble { &__bubble {
font-size: 15px; font-size: 15px;
padding: 4px 10px; padding: 4px 10px;
@ -225,9 +219,10 @@
position: relative; position: relative;
.icon-button { .icon-button {
color: var(--primary-text-color--faint);
position: absolute; position: absolute;
right: 10px; right: 10px;
top: 8px; top: calc(50% - 13px);
width: auto; width: auto;
height: auto; height: auto;
background: transparent !important; background: transparent !important;
@ -237,7 +232,7 @@
} }
.chat-box__send .icon-button { .chat-box__send .icon-button {
top: 12px; top: calc(50% - 9px);
} }
textarea { textarea {
@ -347,8 +342,12 @@
} }
} }
.chat-message__media {
height: 120px;
}
.chat-message .media-gallery { .chat-message .media-gallery {
height: auto !important; height: 100% !important;
margin: 4px 0 8px; margin: 4px 0 8px;
.spoiler-button { .spoiler-button {
@ -358,7 +357,7 @@
.media-gallery__item:not(.media-gallery__item--image) { .media-gallery__item:not(.media-gallery__item--image) {
max-width: 100%; max-width: 100%;
width: 120px !important; width: 120px !important;
height: 70px !important; height: 100% !important;
} }
&__preview { &__preview {