1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00

update Login/Register Container style & fix OnlyGuest Mixin

This commit is contained in:
Rokt33r
2015-07-12 22:00:19 +09:00
parent 36eaebcbc7
commit 1d3e3f3c87
5 changed files with 22 additions and 7 deletions

View File

@@ -63,7 +63,7 @@ module.exports = React.createClass({
<input className='stripInput' valueLink={this.linkState('password')} onChange={this.handleChange} type='password' placeholder='Password'/>
</div>
<div className='form-group'>
<button className='btn-primary' type='submit'><i className='fa fa-sign-in'></i> Log In</button>
<button className='btn-primary' type='submit'>Log In</button>
</div>
</form>
</div>

View File

@@ -73,11 +73,11 @@ module.exports = React.createClass({
<input className='stripInput' valueLink={this.linkState('profileName')} type='text' placeholder='Profile name'/>
</div>
<div className='form-group'>
<button className='btn-primary' type='submit'><i className='fa fa-sign-in'></i> Sign Up</button>
<button className='btn-primary' type='submit'>Sign Up</button>
</div>
</form>
<p>Sign Upをクリックすることで当サイトの利用規約及びCookieの使用を含むデータに関するポリシーに同意するものとします</p>
<p className='alert'>会員登録することで当サイトの利用規約及びCookieの使用を含むデータに関するポリシーに同意するものとします</p>
</div>
)
}

View File

@@ -4,7 +4,9 @@ var OnlyGuest = {
componentDidMount: function () {
if (AuthStore.check()) {
var user = AuthStore.getUser()
console.log(user)
if (user == null) {
return
}
var planet = user.Planets.length > 0 ? user.Planets[0] : null
if (planet == null) {
this.transitionTo('user', {userName: user.name})

View File

@@ -4,6 +4,8 @@
box-sizing border-box
color inactiveTextColor
.logo
width 215px
height 215px
display block
margin 0 auto
.authNavigator
@@ -20,13 +22,16 @@
p
margin-bottom 25px
.facebookBtn, .githubBtn
padding 20px
margin 0 45px
width 75px
height 75px
line-height 75px
font-size 35px
text-align center
background-image none
font-size 25px
color white
border none
circle()
border-radius 37.5px
cursor pointer
.facebookBtn
background-color facebookColor
@@ -34,6 +39,7 @@
background-color lighten(facebookColor, 25%)
.githubBtn
background-color githubBtn
font-size 42px
&:hover, &.hover
background-color lighten(githubBtn, 25%)
.divider
@@ -53,3 +59,9 @@
display block
width 200px
margin 0 auto
&.hover, &:hover
background-color brandColor
color white
p.alert
text-align center
font-size 0.8em

View File

@@ -52,6 +52,7 @@ button
font-size 1em
height 33px
box-sizing border-box
transition 0.1s
&:focus, &.focus
border-bottom 1px solid brandBorderColor
outline none