:v:

6 files changed, 21 insertions, 4 deletions

diff --git a/src/client/app/common/views/components/signup.vue b/src/client/app/common/views/components/signup.vue
index 987cc7e52d..62373a59ec 100644
--- a/src/client/app/common/views/components/signup.vue
+++ b/src/client/app/common/views/components/signup.vue
@@ -1,6 +1,6 @@
 <template>
 <form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()">
-	<ui-input v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" required @input="onChangeUsername">
+	<ui-input v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @input="onChangeUsername">
 		<span>%i18n:@username%</span>
 		<span slot="prefix">@</span>
 		<span slot="suffix">@{{ host }}</span>
diff --git a/src/client/app/common/views/components/ui/input.vue b/src/client/app/common/views/components/ui/input.vue
index a5e47afd53..504f1e32d3 100644
--- a/src/client/app/common/views/components/ui/input.vue
+++ b/src/client/app/common/views/components/ui/input.vue
@@ -15,6 +15,7 @@
 					:readonly="readonly"
 					:pattern="pattern"
 					:autocomplete="autocomplete"
+					:spellcheck="spellcheck"
 					@input="$emit('input', $event.target.value)"
 					@focus="focused = true"
 					@blur="focused = false">
@@ -64,6 +65,9 @@ export default Vue.extend({
 		autocomplete: {
 			required: false
 		},
+		spellcheck: {
+			required: false
+		},
 		withPasswordMeter: {
 			type: Boolean,
 			required: false,
diff --git a/src/client/app/common/views/components/ui/textarea.vue b/src/client/app/common/views/components/ui/textarea.vue
index cc6b376ead..60fe1cdd82 100644
--- a/src/client/app/common/views/components/ui/textarea.vue
+++ b/src/client/app/common/views/components/ui/textarea.vue
@@ -66,7 +66,7 @@ export default Vue.extend({
 @import '~const.styl'
 
 root(isDark, fill)
-	margin 32px 0
+	margin 42px 0 32px 0
 
 	> .input
 		padding 12px
diff --git a/src/client/app/common/views/components/welcome-timeline.vue b/src/client/app/common/views/components/welcome-timeline.vue
index a9d558df66..f3372bf062 100644
--- a/src/client/app/common/views/components/welcome-timeline.vue
+++ b/src/client/app/common/views/components/welcome-timeline.vue
@@ -109,6 +109,9 @@ root(isDark)
 					> .created-at
 						color isDark ? #606984 : #c0c0c0
 
+			> .text
+				text-align left
+
 .mk-welcome-timeline[data-darkmode]
 	root(true)
 
diff --git a/src/client/app/mobile/views/pages/signup.vue b/src/client/app/mobile/views/pages/signup.vue
index 47384e2b3c..238d386efc 100644
--- a/src/client/app/mobile/views/pages/signup.vue
+++ b/src/client/app/mobile/views/pages/signup.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="signup">
-	<h1>Misskeyをはじめる</h1>
+	<h1>📦 始めましょう</h1>
 	<mk-signup/>
 </div>
 </template>
diff --git a/src/client/app/mobile/views/pages/welcome.vue b/src/client/app/mobile/views/pages/welcome.vue
index 3bf2a0af9f..79648ac425 100644
--- a/src/client/app/mobile/views/pages/welcome.vue
+++ b/src/client/app/mobile/views/pages/welcome.vue
@@ -22,10 +22,13 @@
 				<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required/>
 				<ui-button type="submit" :disabled="signing">{{ signing ? 'ログインしています' : 'ログイン' }}</ui-button>
 			</form>
-			<div>
+			<div style="margin: 8px 0;">
 				<a :href="`${apiUrl}/signin/twitter`">Twitterでログイン</a>
 			</div>
 		</div>
+		<div class="tl">
+			<mk-welcome-timeline/>
+		</div>
 		<footer>
 			<small>{{ copyright }}</small>
 		</footer>
@@ -154,6 +157,13 @@ export default Vue.extend({
 						border-color #444
 						box-shadow 0 1px 3px rgba(#000, 0.075), inset 0 0 5px rgba(#000, 0.2)
 
+		> .tl
+			> *
+				max-height 300px
+				border-radius 6px
+				overflow auto
+				-webkit-overflow-scrolling touch
+
 		> footer
 			text-align center
 			color #444