Skip to content

Commit 211fd8b

Browse files
committed
Fix: minor features
設定ボタンアイコンの変更 削除Modalでcmd+enterの使用 検索バーデザイン
1 parent c6ef86c commit 211fd8b

7 files changed

Lines changed: 22 additions & 24 deletions

File tree

browser/main/Components/BlueprintDeleteModal.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ var BlueprintDeleteModal = React.createClass({
77
close: React.PropTypes.func,
88
blueprint: React.PropTypes.object
99
},
10+
componentDidMount: function () {
11+
React.findDOMNode(this).focus()
12+
},
1013
stopPropagation: function (e) {
1114
e.stopPropagation()
1215
},
@@ -21,7 +24,7 @@ var BlueprintDeleteModal = React.createClass({
2124
},
2225
render: function () {
2326
return (
24-
<div onKeyDown={this.handleKeyDown} onClick={this.stopPropagation} className='BlueprintDeleteModal modal'>
27+
<div tabIndex='3' onKeyDown={this.handleKeyDown} onClick={this.stopPropagation} className='BlueprintDeleteModal modal'>
2528
<div className='modal-header'>
2629
<h1>Delete Blueprint</h1>
2730
</div>

browser/main/Components/PlanetHeader.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ var PlanetHeader = React.createClass({
2727
<div className='headerLabel'>
2828
<span className='userName'>{currentUserName}</span><br/>
2929
<span className='planetName'>{currentPlanetName}</span>
30-
<button onClick={this.props.openSettingModal} className={'menuBtn'}>
31-
<i className='fa fa-gears'></i>
30+
<button onClick={this.props.openSettingModal} className='menuBtn'>
31+
<i className='fa fa-chevron-down'></i>
3232
</button>
3333
</div>
3434
<div className='headerControl'>
35-
<span className='searchInput'>
35+
<div className='searchInput'>
3636
<i className='fa fa-search'/>
3737
<input onChange={this.props.onSearchChange} value={this.props.search} ref='search' tabIndex='1' type='text' className='inline-input circleInput' placeholder='Search...'/>
38-
</span>
38+
</div>
3939
<a className='downloadButtton btn-primary'>Download Mac app</a>
4040
</div>
4141
</div>

browser/main/Components/SnippetDeleteModal.jsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ var SnippetDeleteModal = React.createClass({
77
close: React.PropTypes.func,
88
snippet: React.PropTypes.object
99
},
10+
componentDidMount: function () {
11+
React.findDOMNode(this).focus()
12+
},
1013
stopPropagation: function (e) {
1114
e.stopPropagation()
1215
},
1316
handleKeyDown: function (e) {
14-
if ((e.keyCode === 13 && e.metaKey)) {
17+
console.log(e)
18+
if (e.keyCode === 13 && e.metaKey) {
1519
e.preventDefault()
1620
this.submit()
1721
}
@@ -21,7 +25,7 @@ var SnippetDeleteModal = React.createClass({
2125
},
2226
render: function () {
2327
return (
24-
<div onKeyDown={this.handleKeyDown} onClick={this.stopPropagation} className='SnippetDeleteModal modal'>
28+
<div tabIndex='3' onKeyDown={this.handleKeyDown} onClick={this.stopPropagation} className='SnippetDeleteModal modal'>
2529
<div className='modal-header'>
2630
<h1>Delete Snippet</h1>
2731
</div>

browser/styles/main/containers/PlanetContainer.styl

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
.PlanetContainer
32
absolute top bottom right
43
left 50px
@@ -50,30 +49,20 @@
5049
color darken(brandBorderColor, 30%)
5150
.menuBtn
5251
position absolute
53-
top 10px
52+
top 15px
5453
right 5px
5554
font-size 1em
56-
color lightButtonColor
57-
border none
55+
btnDefault()
5856
box-sizing border-box
5957
circle()
60-
background-image none
61-
background-color transparent
62-
width 44px
63-
height 44px
58+
width 33px
59+
height 33px
6460
text-align center
6561
cursor pointer
6662
transition 0.1s
6763
transform scale(0.8)
6864
&:focus, &.focus
6965
outline none
70-
&:hover, &.hover, &:focus, &.focus
71-
border-color darken(lightButtonColor, 50%)
72-
color darken(lightButtonColor, 50%)
73-
&:active, &.active
74-
border-color darken(brandBorderColor, 30%)
75-
background-color brandColor
76-
color white
7766
.headerControl
7867
absolute top bottom right
7968
left 200px
@@ -84,10 +73,12 @@
8473
left 0
8574
input
8675
padding-left 32px
76+
width 300px
8777
.fa
8878
position absolute
8979
top 8px
9080
left 12px
81+
color inactiveTextColor
9182
.downloadButtton
9283
position absolute
9384
right 5px

browser/styles/mixins/btn.styl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ btnDefault()
1313
background-color brandColor
1414
color white
1515

16-
1716
btnPrimary()
1817
border-style solid
1918
border-width 1px

browser/styles/shared/modal.styl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
margin 40px auto
127127
font-size 1.5em
128128
color brandColor
129+
text-align center
129130
nav
130131
button
131132
font-size 1em

browser/styles/vars.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ hoverBackgroundColor= transparentify(#444, 3%)
1313
inactiveTextColor = #888
1414
textColor = #4D4D4D
1515
backgroundColor= white
16-
fontSize= 16px
16+
fontSize= 14px
1717

1818
shadowColor= #C5C5C5
1919

0 commit comments

Comments
 (0)