Skip to content

Commit 0ac7839

Browse files
committed
改善:Login/Register部分のデザイン
1 parent 714b5f7 commit 0ac7839

6 files changed

Lines changed: 28 additions & 24 deletions

File tree

browser/main/Containers/LoginContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ module.exports = React.createClass({
4747
<input className='stripInput' valueLink={this.linkState('password')} onChange={this.handleChange} type='password' placeholder='Password'/>
4848
</div>
4949
<div className='form-group'>
50-
<button className='btn-primary' type='submit'>Log In</button>
50+
<button className='logInButton' type='submit'>Log In</button>
5151
</div>
5252
</form>
5353
</div>

browser/main/Containers/RegisterContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module.exports = React.createClass({
5858
<input className='stripInput' valueLink={this.linkState('profileName')} type='text' placeholder='Profile name'/>
5959
</div>
6060
<div className='form-group'>
61-
<button className='btn-primary' type='submit'>Sign Up</button>
61+
<button className='logInButton' type='submit'>Sign Up</button>
6262
</div>
6363
</form>
6464

browser/styles/main/containers/LoginContainer.styl

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
.LoginContainer, .RegisterContainer
2-
margin 15px auto
2+
margin 0 auto
33
padding 25px 15px
44
box-sizing border-box
55
color inactiveTextColor
66
.logo
7-
width 215px
8-
height 215px
7+
width 150px
8+
height 150px
99
display block
1010
margin 0 auto
1111
.authNavigator
@@ -23,23 +23,24 @@
2323
margin-bottom 25px
2424
.facebookBtn, .githubBtn
2525
margin 0 45px
26-
width 75px
27-
height 75px
28-
line-height 75px
29-
font-size 35px
26+
width 50px
27+
height 50px
28+
line-height 50px
29+
font-size 25px
3030
text-align center
3131
background-image none
3232
color white
3333
border none
34-
border-radius 37.5px
34+
border-radius 25px
3535
cursor pointer
3636
.facebookBtn
3737
background-color facebookColor
3838
&:hover, &.hover
3939
background-color lighten(facebookColor, 25%)
4040
.githubBtn
4141
background-color githubBtn
42-
font-size 42px
42+
font-size 30px
43+
line-height 30px
4344
&:hover, &.hover
4445
background-color lighten(githubBtn, 25%)
4546
.divider
@@ -55,13 +56,14 @@
5556
margin 0 auto 45px
5657
div.form-group:last-child
5758
margin-top 45px
58-
.btn-primary
59+
button.logInButton
60+
btnPrimary()
61+
height 44px
62+
border-radius 22px
5963
display block
6064
width 200px
65+
font-size 1em
6166
margin 0 auto
62-
&.hover, &:hover
63-
background-color brandColor
64-
color white
6567
p.alert
6668
text-align center
6769
font-size 0.8em

browser/styles/main/index.styl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,11 @@ button
4949
margin-bottom 5px
5050

5151
.stripInput
52-
border none
53-
border-bottom 1px solid borderColor
54-
padding 5px 15px
55-
width 100%
52+
stripInput()
5653
display block
54+
width 100%
5755
font-size 1em
5856
height 33px
59-
box-sizing border-box
60-
transition 0.1s
61-
&:focus, &.focus
62-
border-bottom 1px solid brandBorderColor
63-
outline none
6457

6558
.block-input, .inline-input
6659
border solid 1px borderColor

browser/styles/mixins/input.styl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
stripInput()
2+
border none
3+
border-bottom 1px solid borderColor
4+
padding 5px 15px
5+
box-sizing border-box
6+
transition 0.1s
7+
&:focus, &.focus
8+
border-bottom 1px solid brandBorderColor
9+
outline none

0 commit comments

Comments
 (0)