-
- Created
-
-
- {createdAt}
-
+
+
+
Trash{folderName}
+
FOLDER
-
-
- Updated
-
-
- {updatedAt}
-
+
+
+
{createdAt}
+
CREATION DATE
diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl
index 131ff9fd..5ed487d8 100644
--- a/browser/main/Detail/MarkdownNoteDetail.styl
+++ b/browser/main/Detail/MarkdownNoteDetail.styl
@@ -3,9 +3,7 @@
.root
absolute top right bottom
- border-width 0 0 1px
- border-style solid
- border-color $ui-borderColor
+ border-width 0
background-color $ui-noteDetail-backgroundColor
box-shadow $note-detail-box-shadow
@@ -44,7 +42,6 @@
body[data-theme="dark"]
.root
- border-color $ui-dark-borderColor
background-color $ui-dark-noteDetail-backgroundColor
box-shadow none
diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl
index e233755d..e4a8f97d 100644
--- a/browser/main/Detail/SnippetNoteDetail.styl
+++ b/browser/main/Detail/SnippetNoteDetail.styl
@@ -3,9 +3,7 @@
.root
absolute top bottom right
- border-width 0 0 1px
- border-style solid
- border-color $ui-borderColor
+ border-width 0
background-color $ui-noteDetail-backgroundColor
box-shadow $note-detail-box-shadow
@@ -57,7 +55,7 @@
.override
absolute bottom left
- bottom 30px
+ bottom 2px
left 60px
height 23px
z-index 101
diff --git a/browser/main/Main.js b/browser/main/Main.js
index 2868e6a8..bfd1bd5f 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -14,7 +14,6 @@ import InitModal from 'browser/main/modals/InitModal'
import mixpanel from 'browser/main/lib/mixpanel'
import mobileAnalytics from 'browser/main/lib/AwsMobileAnalyticsConfig'
import eventEmitter from 'browser/main/lib/eventEmitter'
-import RealtimeNotification from 'browser/components/RealtimeNotification'
function focused () {
mixpanel.track('MAIN_FOCUSED')
@@ -192,14 +191,6 @@ class Main extends React.Component {
// the width of the navigation bar when it is folded/collapsed
const foldedNavigationWidth = 44
- let notificationBarOffsetLeft
- if (this.state.fullScreen) {
- notificationBarOffsetLeft = 0
- } else if (config.isSideNavFolded) {
- notificationBarOffsetLeft = foldedNavigationWidth
- } else {
- notificationBarOffsetLeft = this.state.navWidth
- }
return (
-
)
}
diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl
index c8023a38..892ad3d8 100644
--- a/browser/main/NoteList/NoteList.styl
+++ b/browser/main/NoteList/NoteList.styl
@@ -2,7 +2,6 @@ $control-height = 30px
.root
absolute left bottom
- bottom 30px
top $topBar-height - 1
background-color $ui-noteList-backgroundColor
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index f394629b..0135e626 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -575,11 +575,7 @@ class NoteList extends React.Component {
// Add notes to the current folder
addNotesFromFiles (filepaths) {
const { dispatch, location } = this.props
-
- const targetIndex = this.getTargetIndex()
-
- const storageKey = this.notes[targetIndex].storage
- const folderKey = this.notes[targetIndex].folder
+ const { storage, folder } = this.resolveTargetFolder()
if (filepaths === undefined) return
filepaths.forEach((filepath) => {
@@ -588,11 +584,11 @@ class NoteList extends React.Component {
const content = data.toString()
const newNote = {
content: content,
- folder: folderKey,
+ folder: folder.key,
title: markdown.strip(findNoteTitle(content)),
type: 'MARKDOWN_NOTE'
}
- dataApi.createNote(storageKey, newNote)
+ dataApi.createNote(storage.key, newNote)
.then((note) => {
dispatch({
type: 'UPDATE_NOTE',
@@ -615,6 +611,36 @@ class NoteList extends React.Component {
return targetIndex
}
+ resolveTargetFolder () {
+ const { data, params } = this.props
+ let storage = data.storageMap.get(params.storageKey)
+
+ // Find first storage
+ if (storage == null) {
+ for (let kv of data.storageMap) {
+ storage = kv[1]
+ break
+ }
+ }
+
+ if (storage == null) this.showMessageBox('No storage for importing note(s)')
+ const folder = _.find(storage.folders, {key: params.folderKey}) || storage.folders[0]
+ if (folder == null) this.showMessageBox('No folder for importing note(s)')
+
+ return {
+ storage,
+ folder
+ }
+ }
+
+ showMessageBox (message) {
+ dialog.showMessageBox(remote.getCurrentWindow(), {
+ type: 'warning',
+ message: message,
+ buttons: ['OK']
+ })
+ }
+
render () {
let { location, notes, config, dispatch } = this.props
let { selectedNoteKeys } = this.state
@@ -631,6 +657,25 @@ class NoteList extends React.Component {
if (note.isTrashed !== true || location.pathname === '/trashed') return true
})
+ moment.locale('en', {
+ relativeTime: {
+ future: 'in %s',
+ past: '%s ago',
+ s: '%ds',
+ ss: '%ss',
+ m: '1m',
+ mm: '%dm',
+ h: 'an hour',
+ hh: '%dh',
+ d: '1d',
+ dd: '%dd',
+ M: '1M',
+ MM: '%dM',
+ y: '1Y',
+ yy: '%dY'
+ }
+ })
+
let noteList = notes
.map(note => {
if (note == null) {
@@ -644,6 +689,7 @@ class NoteList extends React.Component {
config.sortBy === 'CREATED_AT'
? note.createdAt : note.updatedAt
).fromNow('D')
+ const key = `${note.storage}-${note.key}`
if (isDefault) {
return (
diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl
index 9cc38c7c..a3f0ffae 100644
--- a/browser/main/SideNav/SideNav.styl
+++ b/browser/main/SideNav/SideNav.styl
@@ -26,27 +26,22 @@
.switch-buttons
background-color transparent
- border 1px solid $ui-borderColor
- width 110px
+ border 0
height 25px
- margin 20px auto 0px auto
- border-radius 1px
+ margin 20px auto 0px 8px
.non-active-button
- navButtonColor()
- font-weight 600
- width 54px
- height 23px
+ color $ui-inactive-text-color
+ font-size 16px
+ border 0
+ background-color transparent
+ transition 0.2s
+ &:hover
+ color alpha(#0B99F1, 60%)
.active-button
@extend .non-active-button
- background-color $ui-button--active-backgroundColor
- color $ui-text-color
- &:hover
- background-color alpha($ui-button--active-backgroundColor, 70%)
- color alpha($ui-text-color, 70%)
- &:active, &:active:hover
- background-color $ui-button--active-backgroundColor
+ color #0B99F1
.top-menu-label
margin-left 5px
@@ -100,7 +95,7 @@
border-top-right-radius 2px
border-bottom-right-radius 2px
pointer-events none
- font-size 12px
+ font-size 13px
body[data-theme="dark"]
.root, .root--folded
@@ -118,25 +113,10 @@ body[data-theme="dark"]
&:hover
background-color alpha($ui-dark-button--active-backgroundColor, 20%)
- .switch-buttons
- border-color $ui-dark-borderColor
-
.non-active-button
- navDarkButtonColor()
-
- .active-button
- @extend .non-active-button
- background-color $ui-dark-button--active-backgroundColor
- color $ui-dark-text-color
+ color alpha($ui-dark-text-color, 60%)
&:hover
- background-color alpha($ui-dark-button--active-backgroundColor, 70%)
- color alpha($ui-dark-text-color, 70%)
- &:active
- color $ui-dark-text-color
- background-color alpha($ui-dark-button--active-backgroundColor, 60%)
- &:active, &:active:hover
- color $ui-dark-text-color
- background-color $ui-dark-button--active-backgroundColor
+ color alpha(#0B99F1, 60%)
.tag-title
p
diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
index 6ac7718f..1e78c058 100644
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -148,8 +148,8 @@ class SideNav extends React.Component {
>
)
}
diff --git a/browser/styles/index.styl b/browser/styles/index.styl
index 50cd8f7e..e2b4ff3d 100644
--- a/browser/styles/index.styl
+++ b/browser/styles/index.styl
@@ -5,7 +5,7 @@ $danger-color = #c9302c
$danger-lighten-color = lighten(#c9302c, 5%)
// Layouts
-$statusBar-height = 36px
+$statusBar-height = 0px
$sideNav-width = 200px
$sideNav--folded-width = 44px
$topBar-height = 60px