From 8a09de6b283a23761059ecc1abb856a96027c10b Mon Sep 17 00:00:00 2001 From: nvisser Date: Sat, 13 Aug 2022 07:26:51 +0200 Subject: [PATCH 01/33] Add following badge to user preview popup (#9048) --- CHANGELOG.md | 5 +++++ packages/client/src/components/user-preview.vue | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58d79c52b..34ec7a642 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ You should also include the user name that made the change. --> +## 12.x.x (unreleased) + +### Improvements +- Client: Add following badge to user preview popup @nvisser + ## 12.118.1 (2022/08/08) ### Bugfixes diff --git a/packages/client/src/components/user-preview.vue b/packages/client/src/components/user-preview.vue index f80947f75..523960564 100644 --- a/packages/client/src/components/user-preview.vue +++ b/packages/client/src/components/user-preview.vue @@ -2,7 +2,9 @@
- +
@@ -120,6 +122,16 @@ export default defineComponent({ background-color: rgba(0, 0, 0, 0.1); background-size: cover; background-position: center; + > .followed { + position: absolute; + top: 12px; + left: 12px; + padding: 4px 8px; + color: #fff; + background: rgba(0, 0, 0, 0.7); + font-size: 0.7em; + border-radius: 6px; + } } > .avatar { From c97dc7fe933f62615984dc1e1f00d89358964460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=9A=E3=81=8D=E2=AA=A5=E2=84=A2?= <44765629+melt-adzuki@users.noreply.github.com> Date: Sat, 13 Aug 2022 17:41:17 +0900 Subject: [PATCH 02/33] feat: show header with current user avatar on TL (#9051) * feat: show header with current user avatar on TL * refactor(client): use displayMyAvatar prop instead of metadata * refactor(client): prefer v-if to `display: none;` --- .../src/components/global/page-header.vue | 21 ++++++++++++++++++- packages/client/src/pages/timeline.vue | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/page-header.vue index 106e216b9..ba75b2446 100644 --- a/packages/client/src/components/global/page-header.vue +++ b/packages/client/src/components/global/page-header.vue @@ -1,5 +1,8 @@