moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'feat/user-popovers' 

# Conflicts:
#   src/components/user_card/user_card.vue
This commit is contained in:
Shpuld Shpludson 2020-08-27 12:03:05 +00:00
parent fd0d4fbfcf 65ac71139e
commit 6b9ce950c8
3 changed files with 3 additions and 2 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;