sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into neckbeard

This commit is contained in:
Your New SJW Waifu 2020-08-27 21:42:24 -05:00
parent 1c2cf97856 65ac71139e
commit cc34ad280f
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/chat_message/chat_message.scss
View File

@ -2,7 +2,7 @@
.chat-message-wrapper { .chat-message-wrapper {
&.hovered-message-chain { &.hovered-message-chain {
.animated.avatar { .animated.Avatar {
canvas { canvas {
display: none; display: none;
} }

2
src/components/notifications/notifications.scss
View File

@ -39,7 +39,7 @@
word-wrap: break-word; word-wrap: break-word;
word-break: break-word; word-break: break-word;
&:hover .animated.avatar { &:hover .animated.Avatar {
canvas { canvas {
display: none; display: none;
} }

1
src/components/poll/poll.vue
View File

@ -96,6 +96,7 @@
align-items: center; align-items: center;
padding: 0.1em 0.25em; padding: 0.1em 0.25em;
z-index: 1; z-index: 1;
word-break: break-word;
} }
.result-percentage { .result-percentage {
width: 3.5em; width: 3.5em;

4
src/components/user_card/user_card.vue
View File

@ -354,7 +354,7 @@
align-items: flex-start; align-items: flex-start;
max-height: 56px; max-height: 56px;
.avatar { .Avatar {
flex: 1 0 100%; flex: 1 0 100%;
width: 56px; width: 56px;
height: 56px; height: 56px;
@ -364,7 +364,7 @@
} }
} }
&:hover .avatar { &:hover .Avatar {
--still-image-img: visible; --still-image-img: visible;
--still-image-canvas: hidden; --still-image-canvas: hidden;
} }