diff options
| author | Henry Jameson <me@hjkos.com> | 2022-03-22 12:14:02 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2022-03-22 12:14:02 +0200 |
| commit | c6a4a0a32080c88f93f944bf93d534382142e55d (patch) | |
| tree | 4c67a6ab252a276c9afb51066333a57627bb0a10 /src | |
| parent | 7a17eb7fec4e8f7dbe0a288a22498b800886ac01 (diff) | |
| parent | 6a31962ca0dd0eacd69d9d6b30e6ec41698e0758 (diff) | |
Merge remote-tracking branch 'origin/develop' into vue3-again
* origin/develop:
quick fix for alignment in avatars, juggling multiple branches is confusing
fix even more issues with avatars
Update dependency ora to v0.4.1
Update dependency mini-css-extract-plugin to v0.12.0
Update dependency karma-firefox-launcher to v1.3.0
fix avatars in mobile view
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/status/status.scss | 4 | ||||
| -rw-r--r-- | src/components/status/status.vue | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/components/status/status.scss b/src/components/status/status.scss index 3f647b25..5ed43e0d 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -406,13 +406,13 @@ margin-left: 20px; } - .avatar:not(.repeater-avatar) { + .post-avatar { width: 40px; height: 40px; // TODO define those other way somehow? // stylelint-disable rscss/class-format - &.avatar-compact { + &.-compact { width: 32px; height: 32px; } diff --git a/src/components/status/status.vue b/src/components/status/status.vue index ca7f0f72..eb30f28b 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -126,6 +126,7 @@ @click.stop.prevent.capture="toggleUserExpanded" > <UserAvatar + class="post-avatar" :bot="botIndicator" :compact="compact" :better-shadow="betterShadow" @@ -455,6 +456,7 @@ > <div class="left-side"> <UserAvatar + class="post-avatar" :compact="compact" :bot="botIndicator" /> |