diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2022-12-31 06:18:32 +0000 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2022-12-31 06:18:32 +0000 |
| commit | aba06b4ef982d33e1adab17901c25cc5ebab9aac (patch) | |
| tree | 00fbd44cf4be71f48fb1b4a276f950ceac637c92 /packages/frontend/src | |
| parent | Fix #9438 (diff) | |
| parent | :art: (diff) | |
| download | misskey-aba06b4ef982d33e1adab17901c25cc5ebab9aac.tar.gz misskey-aba06b4ef982d33e1adab17901c25cc5ebab9aac.tar.bz2 misskey-aba06b4ef982d33e1adab17901c25cc5ebab9aac.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/frontend/src')
5 files changed, 4 insertions, 6 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', { }); diff --git a/packages/frontend/src/instance.ts b/packages/frontend/src/instance.ts index c6fd1756a5..51464f32fb 100644 --- a/packages/frontend/src/instance.ts +++ b/packages/frontend/src/instance.ts @@ -15,7 +15,6 @@ export const instance: Misskey.entities.InstanceMetadata = reactive(instanceData export async function fetchInstance() { const meta = await api('meta', { detail: false, - omitEmojiUrl: true, }); for (const [k, v] of Object.entries(meta)) { diff --git a/packages/frontend/src/pages/about.vue b/packages/frontend/src/pages/about.vue index 0ed692c5c5..5091114c21 100644 --- a/packages/frontend/src/pages/about.vue +++ b/packages/frontend/src/pages/about.vue @@ -76,7 +76,7 @@ <XFederation/> </MkSpacer> <MkSpacer v-else-if="tab === 'charts'" :content-max="1000" :margin-min="20"> - <MkInstanceStats :chart-limit="500" :detailed="true"/> + <MkInstanceStats/> </MkSpacer> </MkStickyContainer> </template> |