This commit is contained in:
syuilo 2018-06-15 13:08:56 +09:00
parent ca668898f4
commit b1b1b7592b
6 changed files with 21 additions and 4 deletions

View file

@ -1,6 +1,6 @@
<template> <template>
<form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()"> <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>%i18n:@username%</span>
<span slot="prefix">@</span> <span slot="prefix">@</span>
<span slot="suffix">@{{ host }}</span> <span slot="suffix">@{{ host }}</span>

View file

@ -15,6 +15,7 @@
:readonly="readonly" :readonly="readonly"
:pattern="pattern" :pattern="pattern"
:autocomplete="autocomplete" :autocomplete="autocomplete"
:spellcheck="spellcheck"
@input="$emit('input', $event.target.value)" @input="$emit('input', $event.target.value)"
@focus="focused = true" @focus="focused = true"
@blur="focused = false"> @blur="focused = false">
@ -64,6 +65,9 @@ export default Vue.extend({
autocomplete: { autocomplete: {
required: false required: false
}, },
spellcheck: {
required: false
},
withPasswordMeter: { withPasswordMeter: {
type: Boolean, type: Boolean,
required: false, required: false,

View file

@ -66,7 +66,7 @@ export default Vue.extend({
@import '~const.styl' @import '~const.styl'
root(isDark, fill) root(isDark, fill)
margin 32px 0 margin 42px 0 32px 0
> .input > .input
padding 12px padding 12px

View file

@ -109,6 +109,9 @@ root(isDark)
> .created-at > .created-at
color isDark ? #606984 : #c0c0c0 color isDark ? #606984 : #c0c0c0
> .text
text-align left
.mk-welcome-timeline[data-darkmode] .mk-welcome-timeline[data-darkmode]
root(true) root(true)

View file

@ -1,6 +1,6 @@
<template> <template>
<div class="signup"> <div class="signup">
<h1>Misskeyをはじめる</h1> <h1>📦 始めましょう</h1>
<mk-signup/> <mk-signup/>
</div> </div>
</template> </template>

View file

@ -22,10 +22,13 @@
<ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required/> <ui-input v-if="user && user.twoFactorEnabled" v-model="token" type="number" required/>
<ui-button type="submit" :disabled="signing">{{ signing ? 'ログインしています' : 'ログイン' }}</ui-button> <ui-button type="submit" :disabled="signing">{{ signing ? 'ログインしています' : 'ログイン' }}</ui-button>
</form> </form>
<div> <div style="margin: 8px 0;">
<a :href="`${apiUrl}/signin/twitter`">Twitterでログイン</a> <a :href="`${apiUrl}/signin/twitter`">Twitterでログイン</a>
</div> </div>
</div> </div>
<div class="tl">
<mk-welcome-timeline/>
</div>
<footer> <footer>
<small>{{ copyright }}</small> <small>{{ copyright }}</small>
</footer> </footer>
@ -154,6 +157,13 @@ export default Vue.extend({
border-color #444 border-color #444
box-shadow 0 1px 3px rgba(#000, 0.075), inset 0 0 5px rgba(#000, 0.2) 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 > footer
text-align center text-align center
color #444 color #444