From 9c06544c4664575207d088601ae9a1b9e756dbcb Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Feb 2020 16:51:27 +0900
Subject: [PATCH] wip

---
 src/client/components/avatars.vue    | 4 +++-
 src/client/pages/my-groups/index.vue | 6 +++++-
 src/client/style.scss                | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/client/components/avatars.vue b/src/client/components/avatars.vue
index 0dc1ece3bf..5d1aa26a6b 100644
--- a/src/client/components/avatars.vue
+++ b/src/client/components/avatars.vue
@@ -1,6 +1,8 @@
 <template>
 <div>
-	<mk-avatar v-for="user in us" :user="user" :key="user.id" style="width:32px;height:32px;"/>
+	<div v-for="user in us" :key="user.id" style="width:32px;height:32px;margin-right:8px;">
+		<mk-avatar :user="user" style="width:32px;height:32px;"/>
+	</div>
 </div>
 </template>
 
diff --git a/src/client/pages/my-groups/index.vue b/src/client/pages/my-groups/index.vue
index 40e7199dc2..9f51e5132b 100644
--- a/src/client/pages/my-groups/index.vue
+++ b/src/client/pages/my-groups/index.vue
@@ -10,6 +10,7 @@
 		<mk-pagination :pagination="ownedPagination" #default="{items}" ref="owned">
 			<div class="_frame" v-for="group in items" :key="group.id">
 				<div class="_title"><router-link :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</router-link></div>
+				<div class="_content"><mk-avatars :user-ids="group.userIds"/></div>
 			</div>
 		</mk-pagination>
 	</mk-container>
@@ -19,7 +20,7 @@
 		<mk-pagination :pagination="invitePagination" #default="{items}">
 			<div class="_frame" v-for="invite in items" :key="invite.id">
 				<div class="_title">{{ invite.group.name }}</div>
-				<div class="_content"><x-avatars :user-ids="invite.group.userIds"/></div>
+				<div class="_content"><mk-avatars :user-ids="invite.group.userIds"/></div>
 				<div class="_footer">
 					<mk-button @click="acceptInvite(invite)" primary inline><fa :icon="faCheck"/> {{ $t('accept') }}</mk-button>
 					<mk-button @click="rejectInvite(invite)" primary inline><fa :icon="faBan"/> {{ $t('reject') }}</mk-button>
@@ -33,6 +34,7 @@
 		<mk-pagination :pagination="joinedPagination" #default="{items}">
 			<div class="_frame" v-for="group in items" :key="group.id">
 				<div class="_title">{{ group.name }}</div>
+				<div class="_content"><mk-avatars :user-ids="group.userIds"/></div>
 			</div>
 		</mk-pagination>
 	</mk-container>
@@ -45,6 +47,7 @@ import { faUsers, faPlus, faEnvelopeOpenText } from '@fortawesome/free-solid-svg
 import MkPagination from '../../components/ui/pagination.vue';
 import MkButton from '../../components/ui/button.vue';
 import MkContainer from '../../components/ui/container.vue';
+import MkAvatars from '../../components/avatars.vue';
 
 export default Vue.extend({
 	metaInfo() {
@@ -57,6 +60,7 @@ export default Vue.extend({
 		MkPagination,
 		MkButton,
 		MkContainer,
+		MkAvatars,
 	},
 
 	data() {
diff --git a/src/client/style.scss b/src/client/style.scss
index 5280717839..f3516ca199 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -305,7 +305,7 @@ a {
 	position: relative;
 	border: solid 1px var(--divider);
 	border-radius: var(--radius);
-	margin: var(--marginHalf);
+	margin: var(--margin);
 
 	> ._title {
 		margin: 0;