diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2023-02-23 10:56:10 +0000 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2023-02-23 10:56:10 +0000 |
| commit | cb3b167d61d15f048fc7111c3b84ac39889fba25 (patch) | |
| tree | 2badf225dc44ac5040fc982a3dae65a88168f99c /packages | |
| parent | update CHANGELOG.md (diff) | |
| parent | chore(client): tweak online users widget (diff) | |
| download | misskey-cb3b167d61d15f048fc7111c3b84ac39889fba25.tar.gz misskey-cb3b167d61d15f048fc7111c3b84ac39889fba25.tar.bz2 misskey-cb3b167d61d15f048fc7111c3b84ac39889fba25.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to '')
| -rw-r--r-- | packages/frontend/src/ui/deck.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/widgets/WidgetOnlineUsers.vue | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue index 4e93359591..be168b4282 100644 --- a/packages/frontend/src/ui/deck.vue +++ b/packages/frontend/src/ui/deck.vue @@ -98,6 +98,7 @@ import { $i } from '@/account'; import { i18n } from '@/i18n'; import { mainRouter } from '@/router'; import { unisonReload } from '@/scripts/unison-reload'; +import { deviceKind } from '@/scripts/device-kind'; const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue')); mainRouter.navHook = (path, flag): boolean => { @@ -115,7 +116,7 @@ window.addEventListener('resize', () => { isMobile.value = window.innerWidth <= 500; }); -const snapScroll = isMobile; +const snapScroll = deviceKind === 'smartphone' || deviceKind === 'tablet'; const drawerMenuShowing = ref(false); const route = 'TODO'; diff --git a/packages/frontend/src/widgets/WidgetOnlineUsers.vue b/packages/frontend/src/widgets/WidgetOnlineUsers.vue index a096cc8fe8..7949fc4a93 100644 --- a/packages/frontend/src/widgets/WidgetOnlineUsers.vue +++ b/packages/frontend/src/widgets/WidgetOnlineUsers.vue @@ -1,7 +1,7 @@ <template> <div class="mkw-onlineUsers data-cy-mkw-onlineUsers" :class="{ _panel: !widgetProps.transparent, pad: !widgetProps.transparent }"> <I18n v-if="onlineUsersCount" :src="i18n.ts.onlineUsersCount" text-tag="span" class="text"> - <template #n><b>{{ onlineUsersCount }}</b></template> + <template #n><b>{{ number(onlineUsersCount) }}</b></template> </I18n> </div> </template> @@ -13,6 +13,7 @@ import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; import { i18n } from '@/i18n'; +import number from '@/filters/number'; const name = 'onlineUsers'; |