diff --git a/browser/main/Detail/InfoPanel.js b/browser/main/Detail/InfoPanel.js index 99495ece..0cf77994 100644 --- a/browser/main/Detail/InfoPanel.js +++ b/browser/main/Detail/InfoPanel.js @@ -24,7 +24,7 @@ const InfoPanel = ({
- Created at + Created
{createdAt} @@ -32,7 +32,7 @@ const InfoPanel = ({
- Updated at + Updated
{updatedAt} diff --git a/browser/main/Detail/InfoPanel.styl b/browser/main/Detail/InfoPanel.styl index 5db946be..85d2c0b3 100644 --- a/browser/main/Detail/InfoPanel.styl +++ b/browser/main/Detail/InfoPanel.styl @@ -18,6 +18,16 @@ background-color $ui-noteList-backgroundColor border 1px solid $border-color +.control-infoButton-panel-trash + z-index 200 + margin-top 45px + margin-left -230px + position absolute + padding 20px 20px 0 20px + width 320px + background-color $ui-noteList-backgroundColor + border 1px solid $border-color + .group-section display flex line-height 30px @@ -40,6 +50,19 @@ width 160px height 25px +.group-section-control text + color #EA4447 + font-weight 600 + font-size 14px + width 70px + height 25px + background-color rgba(226,33,113,0.1) + border none + outline none + border-radius 2px + margin-right 5px + padding 2px 5px + [id=export-wrap] height 90px display flex @@ -75,6 +98,10 @@ body[data-theme="dark"] background-color $ui-dark-noteList-backgroundColor border 1px solid $ui-dark-borderColor + .control-infoButton-panel-trash + background-color $ui-dark-noteList-backgroundColor + border 1px solid $ui-dark-borderColor + .group-section-label color $ui-inactive-text-color diff --git a/browser/main/Detail/InfoPanelTrashed.js b/browser/main/Detail/InfoPanelTrashed.js new file mode 100644 index 00000000..8fbe0417 --- /dev/null +++ b/browser/main/Detail/InfoPanelTrashed.js @@ -0,0 +1,70 @@ +import React, { PropTypes } from 'react' +import CSSModules from 'browser/lib/CSSModules' +import styles from './InfoPanel.styl' + +const InfoPanelTrashed = ({ + storageName, folderName, updatedAt, createdAt, exportAsMd, exportAsTxt +}) => ( +
+
+
+ Storage +
+
+ {storageName} +
+
+
+
+ Folder +
+
+ in Trash{folderName} +
+
+
+
+ Created +
+
+ {createdAt} +
+
+
+
+ Updated +
+
+ {updatedAt} +
+
+ +
+ + + + + +
+
+) + +InfoPanelTrashed.propTypes = { + storageName: PropTypes.string.isRequired, + folderName: PropTypes.string.isRequired, + updatedAt: PropTypes.string.isRequired, + createdAt: PropTypes.string.isRequired, + exportAsMd: PropTypes.func.isRequired, + exportAsTxt: PropTypes.func.isRequired +} + +export default CSSModules(InfoPanelTrashed, styles) \ No newline at end of file diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 568292ad..6cccd161 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -17,6 +17,7 @@ import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig' import TrashButton from './TrashButton' import InfoButton from './InfoButton' import InfoPanel from './InfoPanel' +import InfoPanelTrashed from './InfoPanelTrashed' import { formatDate } from 'browser/lib/date-formatter' const electron = require('electron') @@ -300,10 +301,9 @@ class MarkdownNoteDetail extends React.Component { this.handleInfoButtonClick(e)} /> - this.handleInfoButtonClick(e)} /> -