mirror of
https://github.com/BoostIo/Boostnote
synced 2025-12-13 09:46:22 +00:00
update Login/Register Container style & fix OnlyGuest Mixin
This commit is contained in:
@@ -63,7 +63,7 @@ module.exports = React.createClass({
|
|||||||
<input className='stripInput' valueLink={this.linkState('password')} onChange={this.handleChange} type='password' placeholder='Password'/>
|
<input className='stripInput' valueLink={this.linkState('password')} onChange={this.handleChange} type='password' placeholder='Password'/>
|
||||||
</div>
|
</div>
|
||||||
<div className='form-group'>
|
<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>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -73,11 +73,11 @@ module.exports = React.createClass({
|
|||||||
<input className='stripInput' valueLink={this.linkState('profileName')} type='text' placeholder='Profile name'/>
|
<input className='stripInput' valueLink={this.linkState('profileName')} type='text' placeholder='Profile name'/>
|
||||||
</div>
|
</div>
|
||||||
<div className='form-group'>
|
<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>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<p>Sign Upをクリックすることで、当サイトの利用規約及びCookieの使用を含むデータに関するポリシーに同意するものとします。</p>
|
<p className='alert'>会員登録することで、当サイトの利用規約及びCookieの使用を含むデータに関するポリシーに同意するものとします。</p>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,9 @@ var OnlyGuest = {
|
|||||||
componentDidMount: function () {
|
componentDidMount: function () {
|
||||||
if (AuthStore.check()) {
|
if (AuthStore.check()) {
|
||||||
var user = AuthStore.getUser()
|
var user = AuthStore.getUser()
|
||||||
console.log(user)
|
if (user == null) {
|
||||||
|
return
|
||||||
|
}
|
||||||
var planet = user.Planets.length > 0 ? user.Planets[0] : null
|
var planet = user.Planets.length > 0 ? user.Planets[0] : null
|
||||||
if (planet == null) {
|
if (planet == null) {
|
||||||
this.transitionTo('user', {userName: user.name})
|
this.transitionTo('user', {userName: user.name})
|
||||||
|
|||||||
@@ -4,6 +4,8 @@
|
|||||||
box-sizing border-box
|
box-sizing border-box
|
||||||
color inactiveTextColor
|
color inactiveTextColor
|
||||||
.logo
|
.logo
|
||||||
|
width 215px
|
||||||
|
height 215px
|
||||||
display block
|
display block
|
||||||
margin 0 auto
|
margin 0 auto
|
||||||
.authNavigator
|
.authNavigator
|
||||||
@@ -20,13 +22,16 @@
|
|||||||
p
|
p
|
||||||
margin-bottom 25px
|
margin-bottom 25px
|
||||||
.facebookBtn, .githubBtn
|
.facebookBtn, .githubBtn
|
||||||
padding 20px
|
|
||||||
margin 0 45px
|
margin 0 45px
|
||||||
|
width 75px
|
||||||
|
height 75px
|
||||||
|
line-height 75px
|
||||||
|
font-size 35px
|
||||||
|
text-align center
|
||||||
background-image none
|
background-image none
|
||||||
font-size 25px
|
|
||||||
color white
|
color white
|
||||||
border none
|
border none
|
||||||
circle()
|
border-radius 37.5px
|
||||||
cursor pointer
|
cursor pointer
|
||||||
.facebookBtn
|
.facebookBtn
|
||||||
background-color facebookColor
|
background-color facebookColor
|
||||||
@@ -34,6 +39,7 @@
|
|||||||
background-color lighten(facebookColor, 25%)
|
background-color lighten(facebookColor, 25%)
|
||||||
.githubBtn
|
.githubBtn
|
||||||
background-color githubBtn
|
background-color githubBtn
|
||||||
|
font-size 42px
|
||||||
&:hover, &.hover
|
&:hover, &.hover
|
||||||
background-color lighten(githubBtn, 25%)
|
background-color lighten(githubBtn, 25%)
|
||||||
.divider
|
.divider
|
||||||
@@ -53,3 +59,9 @@
|
|||||||
display block
|
display block
|
||||||
width 200px
|
width 200px
|
||||||
margin 0 auto
|
margin 0 auto
|
||||||
|
&.hover, &:hover
|
||||||
|
background-color brandColor
|
||||||
|
color white
|
||||||
|
p.alert
|
||||||
|
text-align center
|
||||||
|
font-size 0.8em
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ button
|
|||||||
font-size 1em
|
font-size 1em
|
||||||
height 33px
|
height 33px
|
||||||
box-sizing border-box
|
box-sizing border-box
|
||||||
|
transition 0.1s
|
||||||
&:focus, &.focus
|
&:focus, &.focus
|
||||||
border-bottom 1px solid brandBorderColor
|
border-bottom 1px solid brandBorderColor
|
||||||
outline none
|
outline none
|
||||||
|
|||||||
Reference in New Issue
Block a user