1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-14 18:26:26 +00:00

modify: move updated string to the bottom of note detail component

This commit is contained in:
sota1235
2017-01-14 14:54:08 +09:00
parent f0fcaa6be7
commit 297553c240
4 changed files with 9 additions and 5 deletions

View File

@@ -1,5 +1,7 @@
.info-right-date .info-right-date
display inline display inline
line-height 24px
padding-right 25px
font-size 11px font-size 11px
color $ui-button-color color $ui-button-color

View File

@@ -4,7 +4,6 @@ import styles from './MarkdownNoteDetail.styl'
import MarkdownEditor from 'browser/components/MarkdownEditor' import MarkdownEditor from 'browser/components/MarkdownEditor'
import StarButton from './StarButton' import StarButton from './StarButton'
import TagSelect from './TagSelect' import TagSelect from './TagSelect'
import LastUpdatedString from './LastUpdatedString'
import dataApi from 'browser/main/lib/dataApi' import dataApi from 'browser/main/lib/dataApi'
import { hashHistory } from 'react-router' import { hashHistory } from 'react-router'
import ee from 'browser/main/lib/eventEmitter' import ee from 'browser/main/lib/eventEmitter'
@@ -226,7 +225,6 @@ class MarkdownNoteDetail extends React.Component {
/> />
</div> </div>
<div styleName='info-right'> <div styleName='info-right'>
<LastUpdatedString date={note.updatedAt} />
<button styleName='info-right-button' <button styleName='info-right-button'
onClick={(e) => this.handleContextButtonClick(e)} onClick={(e) => this.handleContextButtonClick(e)}
> >
@@ -248,6 +246,7 @@ class MarkdownNoteDetail extends React.Component {
<StatusBar <StatusBar
{..._.pick(this.props, ['config', 'location', 'dispatch'])} {..._.pick(this.props, ['config', 'location', 'dispatch'])}
date={note.updatedAt}
/> />
</div> </div>
) )

View File

@@ -5,7 +5,6 @@ import CodeEditor from 'browser/components/CodeEditor'
import MarkdownEditor from 'browser/components/MarkdownEditor' import MarkdownEditor from 'browser/components/MarkdownEditor'
import StarButton from './StarButton' import StarButton from './StarButton'
import TagSelect from './TagSelect' import TagSelect from './TagSelect'
import LastUpdatedString from './LastUpdatedString'
import dataApi from 'browser/main/lib/dataApi' import dataApi from 'browser/main/lib/dataApi'
import { hashHistory } from 'react-router' import { hashHistory } from 'react-router'
import ee from 'browser/main/lib/eventEmitter' import ee from 'browser/main/lib/eventEmitter'
@@ -535,7 +534,6 @@ class SnippetNoteDetail extends React.Component {
/> />
</div> </div>
<div styleName='info-right'> <div styleName='info-right'>
<LastUpdatedString date={note.updatedAt} />
<button styleName='info-right-button' <button styleName='info-right-button'
onClick={(e) => this.handleContextButtonClick(e)} onClick={(e) => this.handleContextButtonClick(e)}
> >
@@ -596,6 +594,7 @@ class SnippetNoteDetail extends React.Component {
<StatusBar <StatusBar
{..._.pick(this.props, ['config', 'location', 'dispatch'])} {..._.pick(this.props, ['config', 'location', 'dispatch'])}
date={note.updatedAt}
/> />
</div> </div>
) )

View File

@@ -2,6 +2,7 @@ import React, { PropTypes } from 'react'
import CSSModules from 'browser/lib/CSSModules' import CSSModules from 'browser/lib/CSSModules'
import styles from './StatusBar.styl' import styles from './StatusBar.styl'
import ZoomManager from 'browser/main/lib/ZoomManager' import ZoomManager from 'browser/main/lib/ZoomManager'
import LastUpdatedString from '../Detail/LastUpdatedString'
const electron = require('electron') const electron = require('electron')
const { remote, ipcRenderer } = electron const { remote, ipcRenderer } = electron
@@ -67,6 +68,8 @@ class StatusBar extends React.Component {
</button> </button>
: null : null
} }
<LastUpdatedString date={this.props.date} />
</div> </div>
) )
} }
@@ -76,7 +79,8 @@ StatusBar.contextTypes = {
status: PropTypes.shape({ status: PropTypes.shape({
updateReady: PropTypes.bool.isRequired updateReady: PropTypes.bool.isRequired
}).isRequired, }).isRequired,
config: PropTypes.shape({}).isRequired config: PropTypes.shape({}).isRequired,
date: PropTypes.string
} }
StatusBar.propTypes = { StatusBar.propTypes = {