usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'list-tog' into noman

This commit is contained in:
tamaina 2023-07-31 08:41:19 +00:00
parent ffec11e3f7 c65c181b68
commit 2c4d50692a
5 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -19,7 +19,8 @@
### Client
- メニューのスイッチの動作を改善
- ノートメニューでユーザーリストをスイッチで追加・削除できるように
- Enhance: ユーザーメニューでスイッチでユーザーリストに追加・削除できるように
- Enhance: 自分が押したリアクションのデザインを改善
- Fix: サーバー情報画面(`/instance-info/{domain}`)でブロックができないのを修正
- Fix: 未読のお知らせの「わかった」をクリック・タップしてもその場で「わかった」が消えない問題を修正

2
packages/frontend/package.json
View File

@ -21,7 +21,7 @@
"@rollup/plugin-replace": "5.0.2",
"@rollup/pluginutils": "5.0.2",
"@syuilo/aiscript": "0.15.0",
"@tabler/icons-webfont": "2.25.0",
"@tabler/icons-webfont": "2.30.0",
"@vitejs/plugin-vue": "4.2.3",
"@vue-macros/reactivity-transform": "0.3.15",
"@vue/compiler-sfc": "3.3.4",

12
packages/frontend/src/components/MkReactionsViewer.reaction.vue
View File

@ -143,15 +143,13 @@ useTooltip(buttonEl, async (showing) => {
}
}
&.reacted {
background: var(--accent);
&:hover {
background: var(--accent);
}
&.reacted, &.reacted:hover {
background: var(--accentedBg);
color: var(--accent);
border: 1px solid var(--accent);
> .count {
color: var(--fgOnAccent);
color: var(--accent);
}
> .icon {

2
packages/frontend/src/components/MkUrlPreview.vue
View File

@ -60,7 +60,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template v-if="showActions">
<div v-if="tweetId" :class="$style.action">
<MkButton :small="true" inline @click="tweetExpanded = true">
<i class="ti ti-brand-twitter"></i> {{ i18n.ts.expandTweet }}
<i class="ti ti-brand-x"></i> {{ i18n.ts.expandTweet }}
</MkButton>
</div>
<div v-if="!playerEnabled && player.url" :class="$style.action">

48
pnpm-lock.yaml
View File

@ -662,8 +662,8 @@ importers:
specifier: 0.15.0
version: 0.15.0
'@tabler/icons-webfont':
specifier: 2.25.0
version: 2.25.0
specifier: 2.30.0
version: 2.30.0
'@vitejs/plugin-vue':
specifier: 4.2.3
version: 4.2.3(vite@4.4.4)(vue@3.3.4)
@ -5323,6 +5323,7 @@ packages:
/@mapbox/node-pre-gyp@1.0.9:
resolution: {integrity: sha512-aDF3S3rK9Q2gey/WAttUlISduDItz5BU3306M9Eyv6/oS40aMprnopshtlKTykxRNIBEZuRMaZAnbrQ4QtKGyw==}
hasBin: true
requiresBuild: true
dependencies:
detect-libc: 2.0.1
https-proxy-agent: 5.0.1
@ -7302,7 +7303,7 @@ packages:
ts-dedent: 2.2.0
type-fest: 2.19.0
vue: 3.3.4
vue-component-type-helpers: 1.8.6
vue-component-type-helpers: 1.8.8
transitivePeerDependencies:
- encoding
- supports-color
@ -7713,19 +7714,20 @@ packages:
dependencies:
defer-to-connect: 2.0.1
/@tabler/icons-webfont@2.25.0:
resolution: {integrity: sha512-IWYVnYlCwlGC95kvpY5Hdiyn1/amXOUwsfRthtmgEtHCQly4JSLRuaD90xD0O+pQ+wZBXIVNsO3pKdg74zEaBg==}
/@tabler/icons-webfont@2.30.0:
resolution: {integrity: sha512-tGGKxeATvyHJBHl5FzY4oAShbAiR4ovstG62lqb2HGlOJwz4Io9TSk4eoB88nqxg3sT5no2YsAKXcr1UnlpnNQ==}
dependencies:
'@tabler/icons': 2.25.0
'@tabler/icons': 2.30.0
dev: false
/@tabler/icons@2.25.0:
resolution: {integrity: sha512-Z+FtSZoG/CM1TMCgg7elUew2m0+qMdh5gutMhvxiIY77KIIsE6L/6fUBy+rPXWE9v7MV296fsnCvbpfgwpXupQ==}
/@tabler/icons@2.30.0:
resolution: {integrity: sha512-tvtmkI4ALjKThVVORh++sB9JnkFY7eGInKxNy+Df7WVQiF7T85tlvGADzlgX4Ic+CK5MIUzZ0jhOlQ/RRlgXpg==}
dev: false
/@tensorflow/tfjs-backend-cpu@4.4.0(@tensorflow/tfjs-core@4.4.0):
resolution: {integrity: sha512-d4eln500/qNym78z9IrUUzF0ITBoJGLrxV8xd92kLVoXhg35Mm+zqUXShjFcrH8joOHOFuST0qZ0TbDDqcPzPA==}
engines: {yarn: '>= 1.3.2'}
requiresBuild: true
peerDependencies:
'@tensorflow/tfjs-core': 4.4.0
dependencies:
@ -7737,6 +7739,7 @@ packages:
/@tensorflow/tfjs-backend-webgl@4.4.0(@tensorflow/tfjs-core@4.4.0):
resolution: {integrity: sha512-TzQKvfAPgGt9cMG+5bVoTckoG1xr/PVJM/uODkPvzcMqi3j97kuWDXwkYJIgXldStmfiKkU7f5CmyD3Cq3E6BA==}
engines: {yarn: '>= 1.3.2'}
requiresBuild: true
peerDependencies:
'@tensorflow/tfjs-core': 4.4.0
dependencies:
@ -7750,6 +7753,7 @@ packages:
/@tensorflow/tfjs-converter@4.4.0(@tensorflow/tfjs-core@4.4.0):
resolution: {integrity: sha512-JUjpRStrAuw37tgPd5UENu0UjQVuJT09yF7KpOur4BriJ0uQqrbEZHMPHmvUtr5nYzkqlXJTuXIyxvEY/olNpg==}
requiresBuild: true
peerDependencies:
'@tensorflow/tfjs-core': 4.4.0
dependencies:
@ -7759,6 +7763,7 @@ packages:
/@tensorflow/tfjs-core@4.4.0:
resolution: {integrity: sha512-Anxpc7cAOA0Q7EUXdTbQKMg3reFvrdkgDlaYzH9ZfkMq2CgLV4Au6E/s6HmbYn/VrAtWy9mLY5c/lLJqh4764g==}
engines: {yarn: '>= 1.3.2'}
requiresBuild: true
dependencies:
'@types/long': 4.0.2
'@types/offscreencanvas': 2019.7.0
@ -7774,6 +7779,7 @@ packages:
/@tensorflow/tfjs-data@4.4.0(@tensorflow/tfjs-core@4.4.0)(seedrandom@3.0.5):
resolution: {integrity: sha512-aY4eq4cgrsrXeBU6ABZAAN3tV0fG4YcHd0z+cYuNXnCo+VEQLJnPmhn+xymZ4VQZQH4GXbVS4dV9pXMclFNRFw==}
requiresBuild: true
peerDependencies:
'@tensorflow/tfjs-core': 4.4.0
seedrandom: ^3.0.5
@ -7789,6 +7795,7 @@ packages:
/@tensorflow/tfjs-layers@4.4.0(@tensorflow/tfjs-core@4.4.0):
resolution: {integrity: sha512-OGC7shfiD9Gc698hINHK4y9slOJvu5m54tVNm4xf+WSNrw/avvgpar6yyoL5bakYIZNQvFNK75Yr8VRPR7oPeQ==}
requiresBuild: true
peerDependencies:
'@tensorflow/tfjs-core': 4.4.0
dependencies:
@ -7818,6 +7825,7 @@ packages:
/@tensorflow/tfjs@4.4.0(seedrandom@3.0.5):
resolution: {integrity: sha512-EmCsnzdvawyk4b+4JKaLLuicHcJQRZtL1zSy9AWJLiiHTbDDseYgLxfaCEfLk8v2bUe7SBXwl3n3B7OjgvH11Q==}
hasBin: true
requiresBuild: true
dependencies:
'@tensorflow/tfjs-backend-cpu': 4.4.0(@tensorflow/tfjs-core@4.4.0)
'@tensorflow/tfjs-backend-webgl': 4.4.0(@tensorflow/tfjs-core@4.4.0)
@ -8226,6 +8234,7 @@ packages:
/@types/long@4.0.2:
resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==}
requiresBuild: true
dev: false
/@types/matter-js@0.18.5:
@ -8323,10 +8332,12 @@ packages:
/@types/offscreencanvas@2019.3.0:
resolution: {integrity: sha512-esIJx9bQg+QYF0ra8GnvfianIY8qWB0GBx54PK5Eps6m+xTj86KLavHv6qDhzKcu5UUOgNfJ2pWaIIV7TRUd9Q==}
requiresBuild: true
dev: false
/@types/offscreencanvas@2019.7.0:
resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==}
requiresBuild: true
dev: false
/@types/pg@8.10.2:
@ -8415,6 +8426,7 @@ packages:
/@types/seedrandom@2.4.30:
resolution: {integrity: sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ==}
requiresBuild: true
dev: false
/@types/semver@7.5.0:
@ -8541,6 +8553,7 @@ packages:
/@types/webgl-ext@0.0.30:
resolution: {integrity: sha512-LKVgNmBxN0BbljJrVUwkxwRYqzsAEPcZOe6S2T6ZaBDIrFp0qu4FNlpc5sM1tGbXUYFgdVQIoeLk1Y1UoblyEg==}
requiresBuild: true
dev: false
/@types/websocket@1.0.5:
@ -8964,6 +8977,7 @@ packages:
/@webgpu/types@0.1.30:
resolution: {integrity: sha512-9AXJSmL3MzY8ZL//JjudA//q+2kBRGhLBFpkdGksWIuxrMy81nFrCzj2Am+mbh8WoU6rXmv7cY5E3rdlyru2Qg==}
requiresBuild: true
dev: false
/@xmldom/xmldom@0.8.6:
@ -9056,12 +9070,14 @@ packages:
/adm-zip@0.5.10:
resolution: {integrity: sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==}
engines: {node: '>=6.0'}
requiresBuild: true
dev: false
optional: true
/agent-base@4.3.0:
resolution: {integrity: sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==}
engines: {node: '>= 4.0.0'}
requiresBuild: true
dependencies:
es6-promisify: 5.0.0
dev: false
@ -11757,11 +11773,13 @@ packages:
/es6-promise@4.2.8:
resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==}
requiresBuild: true
dev: false
optional: true
/es6-promisify@5.0.0:
resolution: {integrity: sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==}
requiresBuild: true
dependencies:
es6-promise: 4.2.8
dev: false
@ -12967,6 +12985,7 @@ packages:
/fs-minipass@1.2.7:
resolution: {integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==}
requiresBuild: true
dependencies:
minipass: 2.9.0
dev: false
@ -13337,6 +13356,7 @@ packages:
/google-protobuf@3.21.2:
resolution: {integrity: sha512-3MSOYFO5U9mPGikIYCzK0SaThypfGgS6bHqrUGXG3DPHCrb+txNqeEcns1W0lkGfk0rCyNXm7xB9rMxnCiZOoA==}
requiresBuild: true
dev: false
optional: true
@ -13789,6 +13809,7 @@ packages:
/https-proxy-agent@2.2.4:
resolution: {integrity: sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==}
engines: {node: '>= 4.5.0'}
requiresBuild: true
dependencies:
agent-base: 4.3.0
debug: 3.2.7(supports-color@5.5.0)
@ -15671,6 +15692,7 @@ packages:
/long@4.0.0:
resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
requiresBuild: true
dev: false
/loose-envify@1.4.0:
@ -16115,6 +16137,7 @@ packages:
/minipass@2.9.0:
resolution: {integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==}
requiresBuild: true
dependencies:
safe-buffer: 5.2.1
yallist: 3.1.1
@ -16138,6 +16161,7 @@ packages:
/minizlib@1.3.3:
resolution: {integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==}
requiresBuild: true
dependencies:
minipass: 2.9.0
dev: false
@ -16491,12 +16515,14 @@ packages:
/node-gyp-build-optional-packages@5.0.7:
resolution: {integrity: sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==}
hasBin: true
requiresBuild: true
dev: false
optional: true
/node-gyp-build@4.6.0:
resolution: {integrity: sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==}
hasBin: true
requiresBuild: true
/node-gyp@9.4.0:
resolution: {integrity: sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==}
@ -16563,6 +16589,7 @@ packages:
resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==}
engines: {node: '>=6'}
hasBin: true
requiresBuild: true
dependencies:
abbrev: 1.1.1
dev: false
@ -20056,6 +20083,7 @@ packages:
/tar@4.4.19:
resolution: {integrity: sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==}
engines: {node: '>=4.5'}
requiresBuild: true
dependencies:
chownr: 1.1.4
fs-minipass: 1.2.7
@ -21178,8 +21206,8 @@ packages:
resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
engines: {node: '>=0.10.0'}
/vue-component-type-helpers@1.8.6:
resolution: {integrity: sha512-vKWeoKVEV51ZzoB8+UY0apMXiifbPQxWlcZlvQRDVdiOHmEkCBClWeIGbqQ8cCR9P4j+oCyLW87sraZFMz/qnA==}
/vue-component-type-helpers@1.8.8:
resolution: {integrity: sha512-Ohv9HQY92nSbpReC6WhY0X4YkOszHzwUHaaN/lev5tHQLM1AEw+LrLeB2bIGIyKGDU7ZVrncXcv/oBny4rjbYg==}
dev: true
/vue-docgen-api@4.64.1(vue@3.3.4):