Merge branch 'develop' of https://github.com/syuilo/misskey into develop

3 files changed, 17 insertions, 6 deletions

diff --git a/src/client/components/emoji-picker.vue b/src/client/components/emoji-picker.vue
index 6d95b253af..868a6125c4 100644
--- a/src/client/components/emoji-picker.vue
+++ b/src/client/components/emoji-picker.vue
@@ -67,7 +67,7 @@ import Vue from 'vue';
 import i18n from '../i18n';
 import { emojilist } from '../../misc/emojilist';
 import { getStaticImageUrl } from '../scripts/get-static-image-url';
-import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faHistory } from '@fortawesome/free-solid-svg-icons';
+import { faAsterisk, faLeaf, faUtensils, faFutbol, faCity, faDice, faGlobe, faHistory, faUser } from '@fortawesome/free-solid-svg-icons';
 import { faHeart, faFlag, faLaugh } from '@fortawesome/free-regular-svg-icons';
 import { groupByX } from '../../prelude/array';
 import XPopup from './popup.vue';
@@ -95,10 +95,14 @@ export default Vue.extend({
 				icon: faAsterisk,
 				isActive: true
 			}, {
-				name: 'people',
+				name: 'face',
 				icon: faLaugh,
 				isActive: false
 			}, {
+				name: 'people',
+				icon: faUser,
+				isActive: false
+			}, {
 				name: 'animals_and_nature',
 				icon: faLeaf,
 				isActive: false
diff --git a/src/client/components/note.vue b/src/client/components/note.vue
index 76e9ddb4ba..f30173200e 100644
--- a/src/client/components/note.vue
+++ b/src/client/components/note.vue
@@ -21,7 +21,10 @@
 			</router-link>
 		</i18n>
 		<div class="info">
-			<button class="_button time" @click="showRenoteMenu()" ref="renoteTime"><mk-time :time="note.createdAt"/></button>
+			<button class="_button time" @click="showRenoteMenu()" ref="renoteTime">
+				<fa class="dropdownIcon" :icon="faEllipsisH"/>
+				<mk-time :time="note.createdAt"/>
+			</button>
 			<span class="visibility" v-if="note.visibility !== 'public'">
 				<fa v-if="note.visibility === 'home'" :icon="faHome"/>
 				<fa v-if="note.visibility === 'followers'" :icon="faUnlock"/>
@@ -85,7 +88,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { faBolt, faTimes, faBullhorn, faStar, faLink, faExternalLinkSquareAlt, faPlus, faMinus, faRetweet, faReply, faReplyAll, faEllipsisH, faHome, faUnlock, faEnvelope, faThumbtack, faBan, faQuoteRight, faInfoCircle } from '@fortawesome/free-solid-svg-icons';
+import { faBolt, faTimes, faBullhorn, faStar, faLink, faExternalLinkSquareAlt, faPlus, faMinus, faRetweet, faReply, faReplyAll, faEllipsisH, faHome, faUnlock, faEnvelope, faThumbtack, faBan, faQuoteRight, faInfoCircle, faEllipsisH } from '@fortawesome/free-solid-svg-icons';
 import { faCopy, faTrashAlt, faEdit, faEye, faEyeSlash } from '@fortawesome/free-regular-svg-icons';
 import { parse } from '../../mfm/parse';
 import { sum, unique } from '../../prelude/array';
@@ -143,7 +146,7 @@ export default Vue.extend({
 			showContent: false,
 			hideThisNote: false,
 			noteBody: this.$refs.noteBody,
-			faEdit, faBolt, faTimes, faBullhorn, faPlus, faMinus, faRetweet, faReply, faReplyAll, faEllipsisH, faHome, faUnlock, faEnvelope, faThumbtack, faBan
+			faEdit, faBolt, faTimes, faBullhorn, faPlus, faMinus, faRetweet, faReply, faReplyAll, faEllipsisH, faHome, faUnlock, faEnvelope, faThumbtack, faBan, faEllipsisH
 		};
 	},
 
@@ -857,6 +860,10 @@ export default Vue.extend({
 			> .time {
 				flex-shrink: 0;
 				color: inherit;
+
+				> .dropdownIcon {
+					margin-right: 4px;
+				}
 			}
 
 			> .visibility {
diff --git a/src/client/components/signup.vue b/src/client/components/signup.vue
index 6452afc886..acb6a745ab 100644
--- a/src/client/components/signup.vue
+++ b/src/client/components/signup.vue
@@ -183,7 +183,7 @@ export default Vue.extend({
 				password: this.password,
 				invitationCode: this.invitationCode,
 				'hcaptcha-response': this.hCaptchaResponse,
-				'g-recaptcha-response': this.meta.reCaptchaResponse,
+				'g-recaptcha-response': this.reCaptchaResponse,
 			}).then(() => {
 				this.$root.api('signin', {
 					username: this.username,