Skip to content

Commit 1d3e3f3

Browse files
committed
update Login/Register Container style & fix OnlyGuest Mixin
1 parent 36eaebc commit 1d3e3f3

5 files changed

Lines changed: 22 additions & 7 deletions

File tree

browser/main/Containers/LoginContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ module.exports = React.createClass({
6363
<input className='stripInput' valueLink={this.linkState('password')} onChange={this.handleChange} type='password' placeholder='Password'/>
6464
</div>
6565
<div className='form-group'>
66-
<button className='btn-primary' type='submit'><i className='fa fa-sign-in'></i> Log In</button>
66+
<button className='btn-primary' type='submit'>Log In</button>
6767
</div>
6868
</form>
6969
</div>

browser/main/Containers/RegisterContainer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ module.exports = React.createClass({
7373
<input className='stripInput' valueLink={this.linkState('profileName')} type='text' placeholder='Profile name'/>
7474
</div>
7575
<div className='form-group'>
76-
<button className='btn-primary' type='submit'><i className='fa fa-sign-in'></i> Sign Up</button>
76+
<button className='btn-primary' type='submit'>Sign Up</button>
7777
</div>
7878
</form>
7979

80-
<p>Sign Upをクリックすることで、当サイトの利用規約及びCookieの使用を含むデータに関するポリシーに同意するものとします。</p>
80+
<p className='alert'>会員登録することで、当サイトの利用規約及びCookieの使用を含むデータに関するポリシーに同意するものとします。</p>
8181
</div>
8282
)
8383
}

browser/main/Mixins/OnlyGuest.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ var OnlyGuest = {
44
componentDidMount: function () {
55
if (AuthStore.check()) {
66
var user = AuthStore.getUser()
7-
console.log(user)
7+
if (user == null) {
8+
return
9+
}
810
var planet = user.Planets.length > 0 ? user.Planets[0] : null
911
if (planet == null) {
1012
this.transitionTo('user', {userName: user.name})

browser/styles/main/containers/LoginContainer.styl

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
box-sizing border-box
55
color inactiveTextColor
66
.logo
7+
width 215px
8+
height 215px
79
display block
810
margin 0 auto
911
.authNavigator
@@ -20,20 +22,24 @@
2022
p
2123
margin-bottom 25px
2224
.facebookBtn, .githubBtn
23-
padding 20px
2425
margin 0 45px
26+
width 75px
27+
height 75px
28+
line-height 75px
29+
font-size 35px
30+
text-align center
2531
background-image none
26-
font-size 25px
2732
color white
2833
border none
29-
circle()
34+
border-radius 37.5px
3035
cursor pointer
3136
.facebookBtn
3237
background-color facebookColor
3338
&:hover, &.hover
3439
background-color lighten(facebookColor, 25%)
3540
.githubBtn
3641
background-color githubBtn
42+
font-size 42px
3743
&:hover, &.hover
3844
background-color lighten(githubBtn, 25%)
3945
.divider
@@ -53,3 +59,9 @@
5359
display block
5460
width 200px
5561
margin 0 auto
62+
&.hover, &:hover
63+
background-color brandColor
64+
color white
65+
p.alert
66+
text-align center
67+
font-size 0.8em

browser/styles/main/index.styl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ button
5252
font-size 1em
5353
height 33px
5454
box-sizing border-box
55+
transition 0.1s
5556
&:focus, &.focus
5657
border-bottom 1px solid brandBorderColor
5758
outline none

0 commit comments

Comments
 (0)