From 297553c2401f5f60f4abeab71fd465d5e66918dd Mon Sep 17 00:00:00 2001 From: sota1235 Date: Sat, 14 Jan 2017 14:54:08 +0900 Subject: [PATCH] modify: move updated string to the bottom of note detail component --- browser/main/Detail/LastUpdatedString.styl | 2 ++ browser/main/Detail/MarkdownNoteDetail.js | 3 +-- browser/main/Detail/SnippetNoteDetail.js | 3 +-- browser/main/StatusBar/index.js | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/browser/main/Detail/LastUpdatedString.styl b/browser/main/Detail/LastUpdatedString.styl index a6c94c62..e5270dc4 100644 --- a/browser/main/Detail/LastUpdatedString.styl +++ b/browser/main/Detail/LastUpdatedString.styl @@ -1,5 +1,7 @@ .info-right-date display inline + line-height 24px + padding-right 25px font-size 11px color $ui-button-color diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 17eef19c..dfff72d7 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -4,7 +4,6 @@ import styles from './MarkdownNoteDetail.styl' import MarkdownEditor from 'browser/components/MarkdownEditor' import StarButton from './StarButton' import TagSelect from './TagSelect' -import LastUpdatedString from './LastUpdatedString' import dataApi from 'browser/main/lib/dataApi' import { hashHistory } from 'react-router' import ee from 'browser/main/lib/eventEmitter' @@ -226,7 +225,6 @@ class MarkdownNoteDetail extends React.Component { />
-
) diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index 40d3eb96..29d114ec 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -5,7 +5,6 @@ import CodeEditor from 'browser/components/CodeEditor' import MarkdownEditor from 'browser/components/MarkdownEditor' import StarButton from './StarButton' import TagSelect from './TagSelect' -import LastUpdatedString from './LastUpdatedString' import dataApi from 'browser/main/lib/dataApi' import { hashHistory } from 'react-router' import ee from 'browser/main/lib/eventEmitter' @@ -535,7 +534,6 @@ class SnippetNoteDetail extends React.Component { />
-
) diff --git a/browser/main/StatusBar/index.js b/browser/main/StatusBar/index.js index 6b83419a..2e8a4d35 100644 --- a/browser/main/StatusBar/index.js +++ b/browser/main/StatusBar/index.js @@ -2,6 +2,7 @@ import React, { PropTypes } from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './StatusBar.styl' import ZoomManager from 'browser/main/lib/ZoomManager' +import LastUpdatedString from '../Detail/LastUpdatedString' const electron = require('electron') const { remote, ipcRenderer } = electron @@ -67,6 +68,8 @@ class StatusBar extends React.Component { : null } + + ) } @@ -76,7 +79,8 @@ StatusBar.contextTypes = { status: PropTypes.shape({ updateReady: PropTypes.bool.isRequired }).isRequired, - config: PropTypes.shape({}).isRequired + config: PropTypes.shape({}).isRequired, + date: PropTypes.string } StatusBar.propTypes = {