From 27c056cbbf6e85a033e85adbafd95a179a9db755 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 9 Oct 2021 12:33:08 +0900 Subject: tweak ui --- src/client/components/global/header.vue | 319 ++++++++++++++++++++++++ src/client/components/index.ts | 2 + src/client/components/modal-page-window.vue | 3 - src/client/components/page-window.vue | 6 +- src/client/pages/announcements.vue | 34 ++- src/client/pages/antenna-timeline.vue | 2 +- src/client/pages/emojis.vue | 12 +- src/client/pages/explore.vue | 126 +++++----- src/client/pages/favorites.vue | 14 +- src/client/pages/featured.vue | 17 +- src/client/pages/federation.vue | 182 +++++++------- src/client/pages/instance/ads.vue | 89 ++++--- src/client/pages/instance/announcements.vue | 52 ++-- src/client/pages/instance/emojis.vue | 30 ++- src/client/pages/instance/index.vue | 6 +- src/client/pages/instance/users.vue | 29 ++- src/client/pages/mentions.vue | 15 +- src/client/pages/messages.vue | 13 +- src/client/pages/messaging/index.vue | 73 +++--- src/client/pages/messaging/messaging-room.vue | 2 +- src/client/pages/my-lists/index.vue | 25 +- src/client/pages/my-lists/list.vue | 57 +++-- src/client/pages/notifications.vue | 12 +- src/client/pages/pages.vue | 13 +- src/client/pages/search.vue | 15 +- src/client/pages/settings/index.vue | 10 +- src/client/pages/settings/profile.vue | 1 - src/client/pages/timeline.vue | 38 +-- src/client/pages/user-list-timeline.vue | 2 +- src/client/pages/user/index.vue | 346 +++++++++++++------------- src/client/scripts/scroll.ts | 20 +- src/client/ui/_common_/header.vue | 295 ---------------------- src/client/ui/chat/index.vue | 4 +- src/client/ui/chat/side.vue | 4 +- src/client/ui/deck/main-column.vue | 3 - src/client/ui/default.side.vue | 7 +- src/client/ui/default.vue | 45 +--- src/client/ui/universal.vue | 29 +-- src/client/ui/zen.vue | 4 +- 39 files changed, 1042 insertions(+), 914 deletions(-) create mode 100644 src/client/components/global/header.vue delete mode 100644 src/client/ui/_common_/header.vue (limited to 'src/client') diff --git a/src/client/components/global/header.vue b/src/client/components/global/header.vue new file mode 100644 index 0000000000..977912e2bd --- /dev/null +++ b/src/client/components/global/header.vue @@ -0,0 +1,319 @@ + + + + + diff --git a/src/client/components/index.ts b/src/client/components/index.ts index 8b914c5eec..8f071dfce1 100644 --- a/src/client/components/index.ts +++ b/src/client/components/index.ts @@ -13,6 +13,7 @@ import i18n from './global/i18n'; import loading from './global/loading.vue'; import error from './global/error.vue'; import ad from './global/ad.vue'; +import header from './global/header.vue'; export default function(app: App) { app.component('I18n', i18n); @@ -28,4 +29,5 @@ export default function(app: App) { app.component('MkLoading', loading); app.component('MkError', error); app.component('MkAd', ad); + app.component('MkHeader', header); } diff --git a/src/client/components/modal-page-window.vue b/src/client/components/modal-page-window.vue index 31931a89b7..c20e2b3087 100644 --- a/src/client/components/modal-page-window.vue +++ b/src/client/components/modal-page-window.vue @@ -11,7 +11,6 @@
- @@ -23,7 +22,6 @@ - - diff --git a/src/client/ui/chat/index.vue b/src/client/ui/chat/index.vue index 7090c9486a..4194a9919f 100644 --- a/src/client/ui/chat/index.vue +++ b/src/client/ui/chat/index.vue @@ -74,7 +74,7 @@
- +
@@ -101,7 +101,6 @@ import XSidebar from '@client/ui/_common_/sidebar.vue'; import XWidgets from './widgets.vue'; import XCommon from '../_common_/common.vue'; import XSide from './side.vue'; -import XHeader from '../_common_/header.vue'; import XHeaderClock from './header-clock.vue'; import * as os from '@client/os'; import { router } from '@client/router'; @@ -117,7 +116,6 @@ export default defineComponent({ XSidebar, XWidgets, XSide, // NOTE: dynamic importするとAsyncComponentWrapperが間に入るせいでref取得できなくて面倒になる - XHeader, XHeaderClock, }, diff --git a/src/client/ui/chat/side.vue b/src/client/ui/chat/side.vue index 3e8904596d..d920e5b77c 100644 --- a/src/client/ui/chat/side.vue +++ b/src/client/ui/chat/side.vue @@ -1,7 +1,7 @@