thomate/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

collateral fixes

Browse source
This commit is contained in:
Henry Jameson 2018-11-25 17:42:41 +03:00
parent 698ebf7003
commit 2f1070deb6
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/status/status.vue
View file

@ -533,6 +533,7 @@ a.unmute {
.status-el:last-child { .status-el:last-child {
border-bottom-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;; border-bottom-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;;
border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius); border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
border-bottom: none;
} }
} }

12
src/components/user_card_content/user_card_content.vue
View file

@ -120,6 +120,7 @@
background-size: cover; background-size: cover;
border-radius: $fallback--panelRadius; border-radius: $fallback--panelRadius;
border-radius: var(--panelRadius, $fallback--panelRadius); border-radius: var(--panelRadius, $fallback--panelRadius);
overflow: hidden;
.panel-heading { .panel-heading {
padding: 0.6em 0em; padding: 0.6em 0em;
@ -147,7 +148,6 @@
padding: 16px 10px 6px 10px; padding: 16px 10px 6px 10px;
display: flex; display: flex;
max-height: 56px; max-height: 56px;
overflow: hidden;
.avatar { .avatar {
border-radius: $fallback--avatarRadius; border-radius: $fallback--avatarRadius;
@ -187,6 +187,16 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
flex: 1 1 0; flex: 1 1 0;
// This is so that text doesn't get overlapped by avatar's shadow if it has
// big one
z-index: 1;
img {
width: 26px;
height: 26px;
vertical-align: middle;
object-fit: contain
}
} }
.user-name{ .user-name{