1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00

webpack bugfix, tooltip modified, preview button string changed(toggle Preview -> Preview / Edit)

This commit is contained in:
Rokt33r
2015-11-01 23:15:22 +09:00
parent 72f6468d12
commit cc0f2c7c7f
7 changed files with 19 additions and 18 deletions

View File

@@ -29,7 +29,8 @@ export default class ArticleDetail extends React.Component {
super(props)
this.state = {
article: makeInstantArticle(props.activeArticle)
article: makeInstantArticle(props.activeArticle),
previewMode: false
}
}
@@ -139,10 +140,10 @@ export default class ArticleDetail extends React.Component {
</div>
<div className='right'>
<button onClick={e => this.handleEditButtonClick(e)} className='editBtn'>
<i className='fa fa-fw fa-edit'/><span className='tooltip'>Edit 編集 (e)</span>
<i className='fa fa-fw fa-edit'/><span className='tooltip'>Edit (e)</span>
</button>
<button onClick={e => this.handleDeleteButtonClick(e)} className='deleteBtn'>
<i className='fa fa-fw fa-trash'/><span className='tooltip'>Delete 削除 (d)</span>
<i className='fa fa-fw fa-trash'/><span className='tooltip'>Delete (d)</span>
</button>
</div>
</div>
@@ -252,7 +253,7 @@ export default class ArticleDetail extends React.Component {
<div className='right'>
{
this.state.article.mode === 'markdown'
? (<button className='preview' onClick={e => this.handleTogglePreviewButtonClick(e)}>Toggle Preview</button>)
? (<button className='preview' onClick={e => this.handleTogglePreviewButtonClick(e)}>{!this.state.previewMode ? 'Preview' : 'Edit'}</button>)
: null
}
<button onClick={e => this.handleCancelButtonClick(e)}>Cancel</button>

View File

@@ -59,14 +59,14 @@ export default class ArticleNavigator extends React.Component {
<div className='userName'>local</div>
<button onClick={e => this.handlePreferencesButtonClick(e)} className='settingBtn'>
<i className='fa fa-fw fa-chevron-down'/>
<span className='tooltip'>Preferences 環境設定</span>
<span className='tooltip'>Preferences</span>
</button>
</div>
<div className='controlSection'>
<button onClick={e => this.handleNewPostButtonClick(e)} className='newPostBtn'>
New Post
<span className='tooltip'>新しいポスト ( + Enter or a)</span>
<span className='tooltip'>Create a new Post ( + Enter or a)</span>
</button>
</div>
@@ -75,7 +75,7 @@ export default class ArticleNavigator extends React.Component {
<div className='title'>Folders</div>
<button onClick={e => this.handleNewFolderButton(e)} className='addBtn'>
<i className='fa fa-fw fa-plus'/>
<span className='tooltip'>New folder 新しいフォルダー</span>
<span className='tooltip'>Create a new folder</span>
</button>
</div>
<div className='folderList'>

View File

@@ -92,16 +92,16 @@ export default class ArticleTopBar extends React.Component {
: null
}
<div className={'tooltip' + (this.state.isTooltipHidden ? ' hide' : '')}>
- Search by tag タグで検索 : #{'{string}'}<br/>
- Search by folder フォルダーで検索 : in:{'{folder_name}'}
- Search by tag : #{'{string}'}<br/>
- Search by folder : in:{'{folder_name}'}
</div>
</div>
</div>
<div className='right'>
<button onClick={e => this.handleTutorialButtonClick(e)}>?<span className='tooltip'>How to use 使い方</span></button>
<button onClick={e => this.handleTutorialButtonClick(e)}>?<span className='tooltip'>How to use</span></button>
<ExternalLink className='logo' href='http://b00st.io'>
<img src='../../resources/favicon-230x230.png' width='44' height='44'/>
<span className='tooltip'>Boost official page 公式サイト</span>
<span className='tooltip'>Boost official page</span>
</ExternalLink>
</div>
</div>

View File

@@ -205,10 +205,10 @@ iptFocusBorderColor = #369DCD
tooltip()
&.editBtn .tooltip
margin-top 25px
margin-left -65px
margin-left -45px
&.deleteBtn .tooltip
margin-top 25px
margin-left -98px
margin-left -73px
&:hover
color inherit
.tooltip

View File

@@ -106,7 +106,7 @@ infoBtnActiveBgColor = #3A3A3A
transition 0.1s
.tooltip
tooltip()
margin-left -70px
margin-left -50px
margin-top 29px
&:hover
background-color infoBtnActiveBgColor
@@ -122,7 +122,7 @@ infoBtnActiveBgColor = #3A3A3A
.tooltip
tooltip()
margin-top 44px
margin-left -180px
margin-left -120px
&:hover
opacity 1
.tooltip