Skip to content

Fix layout #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 9, 2017
Merged

Fix layout #690

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b78d953
Fix layout
Jul 7, 2017
f46a967
Fix an error
Jul 8, 2017
5047bc9
Fix search area layout
Jul 8, 2017
8951dbf
Fix star position at NoteList
Jul 8, 2017
4b58054
Fix tag area layout at NoteItem
Jul 9, 2017
4b9640e
Fix star position at NoteList
Jul 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix search area layout
  • Loading branch information
Kazu Yokomizo committed Jul 8, 2017
commit 5047bc94ebd719f0930e558b9be71b3ae0d2dc30
14 changes: 5 additions & 9 deletions browser/main/TopBar/TopBar.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,17 @@ $control-height = 34px

.control-search
height 32px
width 1px
flex 1
background-color white
position relative

.control-search-icon
absolute top bottom left
line-height 32px
padding-left 2px
width 35px
color $ui-inactive-text-color
background-color $ui-noteList-backgroundColor

.control-search-input
display block
absolute top bottom right
left 30px
width 100%
padding-left 12px
background-color $ui-noteList-backgroundColor
input
width 100%
height 100%
Expand Down Expand Up @@ -134,6 +129,7 @@ body[data-theme="dark"]
background-color $ui-dark-noteList-backgroundColor

.control-search-input
background-color $ui-dark-noteList-backgroundColor
input
background-color $ui-dark-noteList-backgroundColor
color $ui-dark-text-color
Expand Down
3 changes: 1 addition & 2 deletions browser/main/TopBar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ class TopBar extends React.Component {
>
<div styleName='control'>
<div styleName='control-search'>
<i styleName='control-search-icon' className='fa fa-search fa-fw' />
<div styleName='control-search-input'
onFocus={(e) => this.handleSearchFocus(e)}
onBlur={(e) => this.handleSearchBlur(e)}
Expand All @@ -216,7 +215,7 @@ class TopBar extends React.Component {
ref='searchInput'
value={this.state.search}
onChange={(e) => this.handleSearchChange(e)}
placeholder=''
placeholder='Search'
type='text'
className='searchInput'
/>
Expand Down