diff --git a/src/client/app/common/views/widgets/analog-clock.vue b/src/client/app/common/views/widgets/analog-clock.vue
index cfcdd5a1b6..bff01f89b5 100644
--- a/src/client/app/common/views/widgets/analog-clock.vue
+++ b/src/client/app/common/views/widgets/analog-clock.vue
@@ -1,10 +1,10 @@
diff --git a/src/client/app/common/views/widgets/broadcast.vue b/src/client/app/common/views/widgets/broadcast.vue
index 7bb8ee70b5..1222c3956d 100644
--- a/src/client/app/common/views/widgets/broadcast.vue
+++ b/src/client/app/common/views/widgets/broadcast.vue
@@ -1,6 +1,6 @@
diff --git a/src/client/app/common/views/widgets/calendar.vue b/src/client/app/common/views/widgets/calendar.vue
index f476968348..32ce1efeb7 100644
--- a/src/client/app/common/views/widgets/calendar.vue
+++ b/src/client/app/common/views/widgets/calendar.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/client/app/common/views/widgets/hashtags.vue b/src/client/app/common/views/widgets/hashtags.vue
index dd3933465c..10425abae7 100644
--- a/src/client/app/common/views/widgets/hashtags.vue
+++ b/src/client/app/common/views/widgets/hashtags.vue
@@ -1,12 +1,12 @@
diff --git a/src/client/app/common/views/widgets/instance.vue b/src/client/app/common/views/widgets/instance.vue
index 1053235618..96d6184d1e 100644
--- a/src/client/app/common/views/widgets/instance.vue
+++ b/src/client/app/common/views/widgets/instance.vue
@@ -1,8 +1,8 @@
-
+
-
+
diff --git a/src/client/app/common/views/widgets/memo.vue b/src/client/app/common/views/widgets/memo.vue
index 75a775d77e..8e25d25899 100644
--- a/src/client/app/common/views/widgets/memo.vue
+++ b/src/client/app/common/views/widgets/memo.vue
@@ -1,13 +1,13 @@
-
+
{{ $t('title') }}
-
+
diff --git a/src/client/app/common/views/widgets/nav.vue b/src/client/app/common/views/widgets/nav.vue
index 12003db3f2..2b8caa7be8 100644
--- a/src/client/app/common/views/widgets/nav.vue
+++ b/src/client/app/common/views/widgets/nav.vue
@@ -1,10 +1,10 @@
diff --git a/src/client/app/common/views/widgets/photo-stream.vue b/src/client/app/common/views/widgets/photo-stream.vue
index 362d7fba53..621f3c545c 100644
--- a/src/client/app/common/views/widgets/photo-stream.vue
+++ b/src/client/app/common/views/widgets/photo-stream.vue
@@ -1,6 +1,6 @@
-
+
{{ $t('title') }}
{{ $t('@.loading') }}
@@ -13,7 +13,7 @@
>
{{ $t('no-photos') }}
-
+
diff --git a/src/client/app/common/views/widgets/posts-monitor.vue b/src/client/app/common/views/widgets/posts-monitor.vue
index 1af306b881..0c921e9e41 100644
--- a/src/client/app/common/views/widgets/posts-monitor.vue
+++ b/src/client/app/common/views/widgets/posts-monitor.vue
@@ -1,6 +1,6 @@
-
+
{{ $t('title') }}
@@ -64,7 +64,7 @@
Fedi
-
+
diff --git a/src/client/app/common/views/widgets/rss.vue b/src/client/app/common/views/widgets/rss.vue
index 37ea320730..25f0638b9a 100644
--- a/src/client/app/common/views/widgets/rss.vue
+++ b/src/client/app/common/views/widgets/rss.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/client/app/common/views/widgets/server.vue b/src/client/app/common/views/widgets/server.vue
index fc1b0c513f..dbc4050b26 100644
--- a/src/client/app/common/views/widgets/server.vue
+++ b/src/client/app/common/views/widgets/server.vue
@@ -1,6 +1,6 @@
-
+
{{ $t('title') }}
@@ -13,7 +13,7 @@
-
+
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 138cf6e632..fe13151159 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -158,7 +158,10 @@ init(async (launch, os) => {
{ path: '/authorize-follow', component: MkFollow },
{ path: '/deck', redirect: '/' },
{ path: '*', component: MkNotFound }
- ]
+ ],
+ scrollBehavior(to, from, savedPosition) {
+ return { x: 0, y: 0 };
+ }
});
// Launch the app
diff --git a/src/client/app/desktop/views/components/activity.vue b/src/client/app/desktop/views/components/activity.vue
index 8c79e213a7..d258f7eae5 100644
--- a/src/client/app/desktop/views/components/activity.vue
+++ b/src/client/app/desktop/views/components/activity.vue
@@ -1,6 +1,6 @@
-
+
{{ $t('title') }}
@@ -9,7 +9,7 @@
-
+
diff --git a/src/client/app/desktop/views/components/index.ts b/src/client/app/desktop/views/components/index.ts
index 0bc6fa9af4..c31690028e 100644
--- a/src/client/app/desktop/views/components/index.ts
+++ b/src/client/app/desktop/views/components/index.ts
@@ -18,7 +18,7 @@ import activity from './activity.vue';
import friendsMaker from './friends-maker.vue';
import userCard from './user-card.vue';
import userListTimeline from './user-list-timeline.vue';
-import widgetContainer from './widget-container.vue';
+import uiContainer from './ui-container.vue';
Vue.component('mk-ui', ui);
Vue.component('mk-ui-notification', uiNotification);
@@ -38,4 +38,4 @@ Vue.component('mk-activity', activity);
Vue.component('mk-friends-maker', friendsMaker);
Vue.component('mk-user-card', userCard);
Vue.component('mk-user-list-timeline', userListTimeline);
-Vue.component('mk-widget-container', widgetContainer);
+Vue.component('ui-container', uiContainer);
diff --git a/src/client/app/desktop/views/components/widget-container.vue b/src/client/app/desktop/views/components/ui-container.vue
similarity index 73%
rename from src/client/app/desktop/views/components/widget-container.vue
rename to src/client/app/desktop/views/components/ui-container.vue
index 13a460c921..b4f7744d4e 100644
--- a/src/client/app/desktop/views/components/widget-container.vue
+++ b/src/client/app/desktop/views/components/ui-container.vue
@@ -1,10 +1,16 @@
-