Skip to content

Commit 0ccfd36

Browse files
committed
smaller storage name
1 parent 8452a95 commit 0ccfd36

4 files changed

Lines changed: 21 additions & 7 deletions

File tree

browser/main/Detail/FolderSelect.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ class FolderSelect extends React.Component {
213213
<span styleName='search-optionList-item-name'
214214
style={{borderColor: option.folder.color}}
215215
>
216-
{option.storage.name}/{option.folder.name}
216+
{option.folder.name}
217+
<span styleName='search-optionList-item-name-surfix'>in {option.storage.name}</span>
217218
</span>
218219
</div>
219220
)
@@ -258,7 +259,8 @@ class FolderSelect extends React.Component {
258259
<span styleName='idle-label-name'
259260
style={{borderColor: currentOption.folder.color}}
260261
>
261-
{currentOption.storage.name}/{currentOption.folder.name}
262+
{currentOption.folder.name}
263+
<span styleName='idle-label-name-surfix'>in {currentOption.storage.name}</span>
262264
</span>
263265
</div>
264266
<i styleName='idle-caret' className='fa fa-fw fa-caret-down'/>

browser/main/Detail/FolderSelect.styl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
.idle-label-name
3131
border-left solid 4px transparent
3232
padding 2px 5px
33-
33+
.idle-label-name-surfix
34+
font-size 10px
35+
color $ui-inactive-text-color
36+
margin-left 5px
3437
.idle-caret
3538
absolute right top
3639
height 34px
@@ -79,3 +82,7 @@
7982
.search-optionList-item-name
8083
border-left solid 4px transparent
8184
padding 2px 5px
85+
.search-optionList-item-name-surfix
86+
font-size 10px
87+
color $ui-inactive-text-color
88+
margin-left 5px

browser/main/NoteList/NoteList.styl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@
4242
.item-info-left-folder
4343
border-left 4px solid transparent
4444
padding 2px 5px
45-
45+
color $ui-text-color
46+
.item-info-left-folder-surfix
47+
font-size 10px
48+
margin-left 5px
49+
color $ui-inactive-text-color
4650
.item-info-right
4751
float right
4852

browser/main/NoteList/index.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ class NoteList extends React.Component {
213213
this.notes = notes
214214
// this.notes = this.getNotes()
215215

216-
let noteElements = notes
216+
let noteList = notes
217217
.sort((a, b) => new Date(b.updatedAt) - new Date(a.updatedAt))
218218
.map((note) => {
219219
let storage = _.find(storages, {key: note.storage})
@@ -244,7 +244,8 @@ class NoteList extends React.Component {
244244
<span styleName='item-info-left-folder'
245245
style={{borderColor: folder.color}}
246246
>
247-
{storage.name}/{folder.name}
247+
{folder.name}
248+
<span styleName='item-info-left-folder-surfix'>in {storage.name}</span>
248249
</span>
249250
</div>
250251

@@ -277,7 +278,7 @@ class NoteList extends React.Component {
277278
onKeyDown={(e) => this.handleNoteListKeyDown(e)}
278279
style={this.props.style}
279280
>
280-
{noteElements}
281+
{noteList}
281282
</div>
282283
)
283284
}

0 commit comments

Comments
 (0)