Merge branch 'migrate-accounts-to-idb' into sw-notification-action

src/client/components/global/avatar.vue

@@ -1,9 +1,9 @@
 <template>
-<span class="eiwwqkts _noSelect" :class="{ cat }" :title="acct(user)" v-if="disableLink" v-user-preview="disablePreview ? undefined : user.id" @click="onClick">
+<span class="eiwwqkts _noSelect" :class="{ cat, square: $store.state.squareAvatars }" :title="acct(user)" v-if="disableLink" v-user-preview="disablePreview ? undefined : user.id" @click="onClick">
 	<img class="inner" :src="url" decoding="async"/>
 	<MkUserOnlineIndicator v-if="showIndicator" class="indicator" :user="user"/>
 </span>
-<MkA class="eiwwqkts _noSelect" :class="{ cat }" :to="userPage(user)" :title="acct(user)" :target="target" v-else v-user-preview="disablePreview ? undefined : user.id">
+<MkA class="eiwwqkts _noSelect" :class="{ cat, square: $store.state.squareAvatars }" :to="userPage(user)" :title="acct(user)" :target="target" v-else v-user-preview="disablePreview ? undefined : user.id">
 	<img class="inner" :src="url" decoding="async"/>
 	<MkUserOnlineIndicator v-if="showIndicator" class="indicator" :user="user"/>
 </MkA>
@@ -81,28 +81,6 @@ export default defineComponent({
 	border-radius: 100%;
 	line-height: 16px;
 
-	&.cat {
-		&:before, &:after {
-			background: #df548f;
-			border: solid 4px currentColor;
-			box-sizing: border-box;
-			content: '';
-			display: inline-block;
-			height: 50%;
-			width: 50%;
-		}
-
-		&:before {
-			border-radius: 0 75% 75%;
-			transform: rotate(37.5deg) skew(30deg);
-		}
-
-		&:after {
-			border-radius: 75% 0 75% 75%;
-			transform: rotate(-37.5deg) skew(-30deg);
-		}
-	}
-
 	> .inner {
 		position: absolute;
 		bottom: 0;
@@ -125,5 +103,35 @@ export default defineComponent({
 		width: 20%;
 		height: 20%;
 	}
+
+	&.square {
+		border-radius: 20%;
+
+		> .inner {
+			border-radius: 20%;
+		}
+	}
+
+	&.cat {
+		&:before, &:after {
+			background: #df548f;
+			border: solid 4px currentColor;
+			box-sizing: border-box;
+			content: '';
+			display: inline-block;
+			height: 50%;
+			width: 50%;
+		}
+
+		&:before {
+			border-radius: 0 75% 75%;
+			transform: rotate(37.5deg) skew(30deg);
+		}
+
+		&:after {
+			border-radius: 75% 0 75% 75%;
+			transform: rotate(-37.5deg) skew(-30deg);
+		}
+	}
 }
 </style>

src/client/components/launch-pad.vue

@@ -36,7 +36,7 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import MkModal from '@client/components/ui/modal.vue';
-import { sidebarDef } from '@client/sidebar';
+import { menuDef } from '@client/menu';
 import { instanceName } from '@client/config';
 
 export default defineComponent({
@@ -48,7 +48,7 @@ export default defineComponent({
 
 	data() {
 		return {
-			menuDef: sidebarDef,
+			menuDef: menuDef,
 			items: [],
 			instanceName,
 		};

src/client/components/ui/container.vue

@@ -191,6 +191,8 @@ export default defineComponent({
 	}
 
 	> .content {
+		--stickyTop: 0px;
+
 		&.omitted {
 			position: relative;
 			max-height: var(--maxHeight);

src/client/components/widgets.vue

@@ -43,6 +43,7 @@ export default defineComponent({
 
 	props: {
 		widgets: {
+			type: Array,
 			required: true,
 		},
 		edit: {