summaryrefslogtreecommitdiff
path: root/packages/frontend/src/components
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2022-12-31 06:18:32 +0000
committertamaina <tamaina@hotmail.co.jp>2022-12-31 06:18:32 +0000
commitaba06b4ef982d33e1adab17901c25cc5ebab9aac (patch)
tree00fbd44cf4be71f48fb1b4a276f950ceac637c92 /packages/frontend/src/components
parentFix #9438 (diff)
parent:art: (diff)
downloadsharkey-aba06b4ef982d33e1adab17901c25cc5ebab9aac.tar.gz
sharkey-aba06b4ef982d33e1adab17901c25cc5ebab9aac.tar.bz2
sharkey-aba06b4ef982d33e1adab17901c25cc5ebab9aac.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/frontend/src/components')
-rw-r--r--packages/frontend/src/components/MkInstanceStats.vue4
-rw-r--r--packages/frontend/src/components/MkReactionsViewer.reaction.vue1
-rw-r--r--packages/frontend/src/components/MkRetentionHeatmap.vue2
3 files changed, 3 insertions, 4 deletions
diff --git a/packages/frontend/src/components/MkInstanceStats.vue b/packages/frontend/src/components/MkInstanceStats.vue
index 3500a340a8..382aaf16ef 100644
--- a/packages/frontend/src/components/MkInstanceStats.vue
+++ b/packages/frontend/src/components/MkInstanceStats.vue
@@ -31,7 +31,7 @@
</MkSelect>
</div>
<div class="chart _panel">
- <MkChart :src="chartSrc" :span="chartSpan" :limit="chartLimit" :detailed="detailed"></MkChart>
+ <MkChart :src="chartSrc" :span="chartSpan" :limit="chartLimit" :detailed="true"></MkChart>
</div>
</div>
</MkFolder>
@@ -122,7 +122,7 @@ Chart.register(
Filler,
);
-const chartLimit = 90;
+const chartLimit = 500;
let chartSpan = $ref<'hour' | 'day'>('hour');
let chartSrc = $ref('active-users');
let heatmapSrc = $ref('active-users');
diff --git a/packages/frontend/src/components/MkReactionsViewer.reaction.vue b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
index 8f2f48dcd7..f3c77231db 100644
--- a/packages/frontend/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.reaction.vue
@@ -81,7 +81,6 @@ useTooltip(buttonRef, async (showing) => {
os.popup(XDetails, {
showing,
reaction: props.reaction,
- emojis: props.note.emojis,
users,
count: props.count,
targetElement: buttonRef.value,
diff --git a/packages/frontend/src/components/MkRetentionHeatmap.vue b/packages/frontend/src/components/MkRetentionHeatmap.vue
index f8ae401faa..547fe70a8c 100644
--- a/packages/frontend/src/components/MkRetentionHeatmap.vue
+++ b/packages/frontend/src/components/MkRetentionHeatmap.vue
@@ -72,7 +72,7 @@ async function renderChart() {
const wide = rootEl.offsetWidth > 600;
const narrow = rootEl.offsetWidth < 400;
- const maxDays = wide ? 20 : narrow ? 10 : 15;
+ const maxDays = wide ? 20 : narrow ? 7 : 14;
const raw = await os.api('retention', { });