From 9291da94f11704f7087a78243729f54ce8e81e8b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 11 Feb 2022 13:53:02 +0900
Subject: [PATCH] =?UTF-8?q?enhance(client):=20=E3=83=AA=E3=82=A2=E3=82=AF?=
=?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=94=E3=83=83=E3=82=AB=E3=83=BC?=
=?UTF-8?q?=E3=81=AE=E5=B9=85=E3=80=81=E9=AB=98=E3=81=95=E5=88=B6=E9=99=90?=
=?UTF-8?q?=E3=82=92=E7=B7=A9=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 1 +
packages/client/src/components/emoji-picker.vue | 14 ++++++++++++++
packages/client/src/pages/settings/reaction.vue | 3 +++
3 files changed, 18 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48ac66646..3a75be294 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ You should also include the user name that made the change.
### Improvements
- クライアント: リアクションピッカーのサイズを設定できるように @syuilo
+- クライアント: リアクションピッカーの幅、高さ制限を緩和 @syuilo
### Bugfixes
-
diff --git a/packages/client/src/components/emoji-picker.vue b/packages/client/src/components/emoji-picker.vue
index 4e589b161..8601ea121 100644
--- a/packages/client/src/components/emoji-picker.vue
+++ b/packages/client/src/components/emoji-picker.vue
@@ -377,6 +377,16 @@ defineExpose({
--columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
}
+ &.w4 {
+ width: calc((var(--eachSize) * 8) + (#{$pad} * 2));
+ --columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
+ }
+
+ &.w5 {
+ width: calc((var(--eachSize) * 9) + (#{$pad} * 2));
+ --columns: 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr;
+ }
+
&.h1 {
height: calc((var(--eachSize) * 4) + (#{$pad} * 2));
}
@@ -389,6 +399,10 @@ defineExpose({
height: calc((var(--eachSize) * 8) + (#{$pad} * 2));
}
+ &.h4 {
+ height: calc((var(--eachSize) * 10) + (#{$pad} * 2));
+ }
+
&.asDrawer {
width: 100% !important;
diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue
index a6b1f3130..a188ba353 100644
--- a/packages/client/src/pages/settings/reaction.vue
+++ b/packages/client/src/pages/settings/reaction.vue
@@ -28,12 +28,15 @@
<option :value="1">5</option>
<option :value="2">6</option>
<option :value="3">7</option>
+ <option :value="4">8</option>
+ <option :value="5">9</option>
</FormRadios>
<FormRadios v-model="reactionPickerHeight" class="_formBlock">
<template #label>{{ $ts.height }}</template>
<option :value="1">{{ $ts.small }}</option>
<option :value="2">{{ $ts.medium }}</option>
<option :value="3">{{ $ts.large }}</option>
+ <option :value="4">{{ $ts.large }}+</option>
</FormRadios>
<FormSwitch v-model="reactionPickerUseDrawerForMobile" class="_formBlock">