From 28610193b852c477c3c6a13ada63ef30080a2269 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 22 Jun 2023 21:08:04 -0700
Subject: [PATCH] fix: :lipstick: consistent emoji styling
---
packages/client/src/pages/admin/settings.vue | 3 ---
.../client/src/pages/settings/reaction.vue | 18 +++++++++++-------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index feedaff6d..3f26d63b7 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -131,21 +131,18 @@
}}</template>
<option value="⭐">
<MkEmoji
- class="emoji"
emoji="⭐"
style="height: 1.7em"
/>
</option>
<option value="👍">
<MkEmoji
- class="emoji"
emoji="👍"
style="height: 1.7em"
/>
</option>
<option value="❤️">
<MkEmoji
- class="emoji"
emoji="❤️"
style="height: 1.7em"
/>
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index 929c71e95..8d8bca893 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -23,7 +23,11 @@
class="_button item"
@click="remove(element, $event)"
>
- <MkEmoji :emoji="element" :normal="true" />
+ <MkEmoji
+ :emoji="element"
+ style="height: 1.7em"
+ class="emoji"
+ />
</button>
</template>
<template #footer>
@@ -44,22 +48,22 @@
<FormRadios v-model="reactionPickerSkinTone" class="_formBlock">
<template #label>{{ i18n.ts.reactionPickerSkinTone }}</template>
<option :value="1">
- <MkEmoji :normal="true" emoji="✌️" />
+ <MkEmoji style="height: 1.7em" emoji="✌️" />
</option>
<option :value="6">
- <MkEmoji :normal="true" emoji="✌🏿" />
+ <MkEmoji style="height: 1.7em" emoji="✌🏿" />
</option>
<option :value="5">
- <MkEmoji :normal="true" emoji="✌🏾" />
+ <MkEmoji style="height: 1.7em" emoji="✌🏾" />
</option>
<option :value="4">
- <MkEmoji :normal="true" emoji="✌🏽" />
+ <MkEmoji style="height: 1.7em" emoji="✌🏽" />
</option>
<option :value="3">
- <MkEmoji :normal="true" emoji="✌🏼" />
+ <MkEmoji style="height: 1.7em" emoji="✌🏼" />
</option>
<option :value="2">
- <MkEmoji :normal="true" emoji="✌🏻" />
+ <MkEmoji style="height: 1.7em" emoji="✌🏻" />
</option>
</FormRadios>
<FormRadios v-model="reactionPickerSize" class="_formBlock">