diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-04-28 19:05:18 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-04-28 19:05:18 +0000 |
| commit | 51709ad31893714d98bf7c05cd37d1d07fde65ca (patch) | |
| tree | ace81acf8842a4063e12ae561f1a1a7de6aab2c6 /src/components/basic_user_card/basic_user_card.vue | |
| parent | 4de9daa1144536f03c86d277b4ec1288dc9df432 (diff) | |
| parent | 3056017f8e35c98a7fb42162c7e3460a4ebab619 (diff) | |
Merge branch 'develop' into 'scrobbles-age'
# Conflicts:
# src/i18n/en.json
Diffstat (limited to 'src/components/basic_user_card/basic_user_card.vue')
| -rw-r--r-- | src/components/basic_user_card/basic_user_card.vue | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue index 705e20f5..9e2b0295 100644 --- a/src/components/basic_user_card/basic_user_card.vue +++ b/src/components/basic_user_card/basic_user_card.vue @@ -47,7 +47,6 @@ display: flex; flex: 1 0; margin: 0; - padding: 0.6em 1em; --emoji-size: 14px; |