mirror of
https://github.com/BoostIo/Boostnote
synced 2025-12-13 01:36:22 +00:00
Fixed InfoPanel layout in Trash
This commit is contained in:
@@ -24,7 +24,7 @@ const InfoPanel = ({
|
|||||||
</div>
|
</div>
|
||||||
<div styleName='group-section'>
|
<div styleName='group-section'>
|
||||||
<div styleName='group-section-label'>
|
<div styleName='group-section-label'>
|
||||||
Created at
|
Created
|
||||||
</div>
|
</div>
|
||||||
<div styleName='group-section-control'>
|
<div styleName='group-section-control'>
|
||||||
{createdAt}
|
{createdAt}
|
||||||
@@ -32,7 +32,7 @@ const InfoPanel = ({
|
|||||||
</div>
|
</div>
|
||||||
<div styleName='group-section'>
|
<div styleName='group-section'>
|
||||||
<div styleName='group-section-label'>
|
<div styleName='group-section-label'>
|
||||||
Updated at
|
Updated
|
||||||
</div>
|
</div>
|
||||||
<div styleName='group-section-control'>
|
<div styleName='group-section-control'>
|
||||||
{updatedAt}
|
{updatedAt}
|
||||||
|
|||||||
@@ -18,6 +18,16 @@
|
|||||||
background-color $ui-noteList-backgroundColor
|
background-color $ui-noteList-backgroundColor
|
||||||
border 1px solid $border-color
|
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
|
.group-section
|
||||||
display flex
|
display flex
|
||||||
line-height 30px
|
line-height 30px
|
||||||
@@ -40,6 +50,19 @@
|
|||||||
width 160px
|
width 160px
|
||||||
height 25px
|
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]
|
[id=export-wrap]
|
||||||
height 90px
|
height 90px
|
||||||
display flex
|
display flex
|
||||||
@@ -75,6 +98,10 @@ body[data-theme="dark"]
|
|||||||
background-color $ui-dark-noteList-backgroundColor
|
background-color $ui-dark-noteList-backgroundColor
|
||||||
border 1px solid $ui-dark-borderColor
|
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
|
.group-section-label
|
||||||
color $ui-inactive-text-color
|
color $ui-inactive-text-color
|
||||||
|
|
||||||
|
|||||||
70
browser/main/Detail/InfoPanelTrashed.js
Normal file
70
browser/main/Detail/InfoPanelTrashed.js
Normal file
@@ -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
|
||||||
|
}) => (
|
||||||
|
<div className='infoPanel' styleName='control-infoButton-panel-trash' style={{display: 'none'}}>
|
||||||
|
<div styleName='group-section'>
|
||||||
|
<div styleName='group-section-label'>
|
||||||
|
Storage
|
||||||
|
</div>
|
||||||
|
<div styleName='group-section-control'>
|
||||||
|
{storageName}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div styleName='group-section'>
|
||||||
|
<div styleName='group-section-label'>
|
||||||
|
Folder
|
||||||
|
</div>
|
||||||
|
<div styleName='group-section-control'>
|
||||||
|
<text>in Trash</text>{folderName}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div styleName='group-section'>
|
||||||
|
<div styleName='group-section-label'>
|
||||||
|
Created
|
||||||
|
</div>
|
||||||
|
<div styleName='group-section-control'>
|
||||||
|
{createdAt}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div styleName='group-section'>
|
||||||
|
<div styleName='group-section-label'>
|
||||||
|
Updated
|
||||||
|
</div>
|
||||||
|
<div styleName='group-section-control'>
|
||||||
|
{updatedAt}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id='export-wrap'>
|
||||||
|
<button styleName='export--enable' onClick={(e) => exportAsMd(e)}>
|
||||||
|
<i className='fa fa-file-code-o fa-fw' />
|
||||||
|
<p>.md</p>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button styleName='export--enable' onClick={(e) => exportAsTxt(e)}>
|
||||||
|
<i className='fa fa-file-text-o fa-fw' />
|
||||||
|
<p>.txt</p>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button styleName='export--unable'>
|
||||||
|
<i className='fa fa-file-pdf-o fa-fw' />
|
||||||
|
<p>.pdf</p>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
|
||||||
|
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)
|
||||||
@@ -17,6 +17,7 @@ import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
|
|||||||
import TrashButton from './TrashButton'
|
import TrashButton from './TrashButton'
|
||||||
import InfoButton from './InfoButton'
|
import InfoButton from './InfoButton'
|
||||||
import InfoPanel from './InfoPanel'
|
import InfoPanel from './InfoPanel'
|
||||||
|
import InfoPanelTrashed from './InfoPanelTrashed'
|
||||||
import { formatDate } from 'browser/lib/date-formatter'
|
import { formatDate } from 'browser/lib/date-formatter'
|
||||||
|
|
||||||
const electron = require('electron')
|
const electron = require('electron')
|
||||||
@@ -300,10 +301,9 @@ class MarkdownNoteDetail extends React.Component {
|
|||||||
<InfoButton
|
<InfoButton
|
||||||
onClick={(e) => this.handleInfoButtonClick(e)}
|
onClick={(e) => this.handleInfoButtonClick(e)}
|
||||||
/>
|
/>
|
||||||
<InfoPanel
|
<InfoPanelTrashed
|
||||||
storageName={currentOption.storage.name}
|
storageName={currentOption.storage.name}
|
||||||
folderName={currentOption.folder.name}
|
folderName={currentOption.folder.name}
|
||||||
noteLink={`[${note.title}](${location.query.key})`}
|
|
||||||
updatedAt={formatDate(note.updatedAt)}
|
updatedAt={formatDate(note.updatedAt)}
|
||||||
createdAt={formatDate(note.createdAt)}
|
createdAt={formatDate(note.createdAt)}
|
||||||
exportAsMd={this.exportAsMd}
|
exportAsMd={this.exportAsMd}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
|
|||||||
import TrashButton from './TrashButton'
|
import TrashButton from './TrashButton'
|
||||||
import InfoButton from './InfoButton'
|
import InfoButton from './InfoButton'
|
||||||
import InfoPanel from './InfoPanel'
|
import InfoPanel from './InfoPanel'
|
||||||
|
import InfoPanelTrashed from './InfoPanelTrashed'
|
||||||
import { formatDate } from 'browser/lib/date-formatter'
|
import { formatDate } from 'browser/lib/date-formatter'
|
||||||
|
|
||||||
function pass (name) {
|
function pass (name) {
|
||||||
@@ -559,10 +560,9 @@ class SnippetNoteDetail extends React.Component {
|
|||||||
<InfoButton
|
<InfoButton
|
||||||
onClick={(e) => this.handleInfoButtonClick(e)}
|
onClick={(e) => this.handleInfoButtonClick(e)}
|
||||||
/>
|
/>
|
||||||
<InfoPanel
|
<InfoPanelTrashed
|
||||||
storageName={currentOption.storage.name}
|
storageName={currentOption.storage.name}
|
||||||
folderName={currentOption.folder.name}
|
folderName={currentOption.folder.name}
|
||||||
noteLink={`[${note.title}](${location.query.key})`}
|
|
||||||
updatedAt={formatDate(note.updatedAt)}
|
updatedAt={formatDate(note.updatedAt)}
|
||||||
createdAt={formatDate(note.createdAt)}
|
createdAt={formatDate(note.createdAt)}
|
||||||
exportAsMd={this.showWarning}
|
exportAsMd={this.showWarning}
|
||||||
|
|||||||
Reference in New Issue
Block a user