summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2021-12-17 16:14:43 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2021-12-17 16:14:43 +0900
commitd9257a5c0e0ac5f5772876fd4eff40e8c26a264a (patch)
treea8715cff0148a0b11acf28c9a69d603923db4b03
parentenhance(client): リアクションピッカーの表示方法を選択でき... (diff)
downloadmisskey-d9257a5c0e0ac5f5772876fd4eff40e8c26a264a.tar.gz
misskey-d9257a5c0e0ac5f5772876fd4eff40e8c26a264a.tar.bz2
misskey-d9257a5c0e0ac5f5772876fd4eff40e8c26a264a.zip
:art:
-rw-r--r--locales/ja-JP.yml2
-rw-r--r--packages/client/src/components/emoji-picker.vue7
-rw-r--r--packages/client/src/components/ui/modal.vue2
-rw-r--r--packages/client/src/pages/my-groups/group.vue2
-rw-r--r--packages/client/src/style.scss2
5 files changed, 11 insertions, 4 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 257f4a685f..daac05c66c 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -106,7 +106,7 @@ clickToShow: "クリックして表示"
sensitive: "閲覧注意"
add: "追加"
reaction: "リアクション"
-reactionSettingDescription: "リアクションピッカーに表示するリアクションを設定します。"
+reactionSetting: "ピッカーに表示するリアクション"
reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、+を押して追加します。"
rememberNoteVisibility: "公開範囲を記憶する"
attachCancel: "添付取り消し"
diff --git a/packages/client/src/components/emoji-picker.vue b/packages/client/src/components/emoji-picker.vue
index de2f101375..ff450246f9 100644
--- a/packages/client/src/components/emoji-picker.vue
+++ b/packages/client/src/components/emoji-picker.vue
@@ -391,6 +391,13 @@ export default defineComponent({
> .emojis {
::v-deep(section) {
+ > header {
+ height: 32px;
+ line-height: 32px;
+ padding: 0 12px;
+ font-size: 15px;
+ }
+
> div {
display: grid;
grid-template-columns: var(--columns);
diff --git a/packages/client/src/components/ui/modal.vue b/packages/client/src/components/ui/modal.vue
index 1d0b79a87e..b875d01c07 100644
--- a/packages/client/src/components/ui/modal.vue
+++ b/packages/client/src/components/ui/modal.vue
@@ -102,7 +102,7 @@ export default defineComponent({
};
if (type.value === 'drawer') {
- maxHeight.value = 300;
+ maxHeight.value = window.innerHeight - 100;
}
const keymap = {
diff --git a/packages/client/src/pages/my-groups/group.vue b/packages/client/src/pages/my-groups/group.vue
index e13e8c0e57..89c8659b4f 100644
--- a/packages/client/src/pages/my-groups/group.vue
+++ b/packages/client/src/pages/my-groups/group.vue
@@ -2,7 +2,7 @@
<div class="mk-group-page">
<transition name="zoom" mode="out-in">
<div v-if="group" class="_section">
- <div class="_content">
+ <div class="_content" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
<MkButton inline @click="invite()">{{ $ts.invite }}</MkButton>
<MkButton inline @click="renameGroup()">{{ $ts.rename }}</MkButton>
<MkButton inline @click="transfer()">{{ $ts.transfer }}</MkButton>
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index cd866f3da9..181521b4f5 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -346,7 +346,7 @@ hr {
._popup {
background: var(--popup);
border-radius: var(--radius);
- contain: contain;
+ contain: content;
}
// TODO: 廃止