diff --git a/browser/main/Detail/FolderSelect.js b/browser/main/Detail/FolderSelect.js index eff89d10..a937275a 100644 --- a/browser/main/Detail/FolderSelect.js +++ b/browser/main/Detail/FolderSelect.js @@ -213,7 +213,8 @@ class FolderSelect extends React.Component { - {option.storage.name}/{option.folder.name} + {option.folder.name} + in {option.storage.name} ) @@ -258,7 +259,8 @@ class FolderSelect extends React.Component { - {currentOption.storage.name}/{currentOption.folder.name} + {currentOption.folder.name} + in {currentOption.storage.name} diff --git a/browser/main/Detail/FolderSelect.styl b/browser/main/Detail/FolderSelect.styl index 64ecb35b..7aa61364 100644 --- a/browser/main/Detail/FolderSelect.styl +++ b/browser/main/Detail/FolderSelect.styl @@ -30,7 +30,10 @@ .idle-label-name border-left solid 4px transparent padding 2px 5px - +.idle-label-name-surfix + font-size 10px + color $ui-inactive-text-color + margin-left 5px .idle-caret absolute right top height 34px @@ -79,3 +82,7 @@ .search-optionList-item-name border-left solid 4px transparent padding 2px 5px +.search-optionList-item-name-surfix + font-size 10px + color $ui-inactive-text-color + margin-left 5px diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl index 46023735..642b5d4b 100644 --- a/browser/main/NoteList/NoteList.styl +++ b/browser/main/NoteList/NoteList.styl @@ -42,7 +42,11 @@ .item-info-left-folder border-left 4px solid transparent padding 2px 5px - + color $ui-text-color +.item-info-left-folder-surfix + font-size 10px + margin-left 5px + color $ui-inactive-text-color .item-info-right float right diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index 3582dd71..d46439ab 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -213,7 +213,7 @@ class NoteList extends React.Component { this.notes = notes // this.notes = this.getNotes() - let noteElements = notes + let noteList = notes .sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt)) .map((note) => { let storage = _.find(storages, {key: note.storage}) @@ -244,7 +244,8 @@ class NoteList extends React.Component { - {storage.name}/{folder.name} + {folder.name} + in {storage.name} @@ -277,7 +278,7 @@ class NoteList extends React.Component { onKeyDown={(e) => this.handleNoteListKeyDown(e)} style={this.props.style} > - {noteElements} + {noteList} ) }