public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00
Code Issues Releases Wiki Activity

Fix CI error

Browse Source
This commit is contained in:
Kazu Yokomizo
2017-11-06 16:11:00 +09:00
parent 123a73a5e6
commit c86e43597c
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
browser/main/Detail/InfoPanel.styl
View File

@@ -33,12 +33,13 @@
.control-infoButton-panel-trash .control-infoButton-panel-trash
z-index 200 z-index 200
margin-top 45px margin-top 45px
margin-left -230px margin-left -190px
position absolute position absolute
padding 20px 20px 0 20px padding 20px 25px 0 25px
width 320px width 300px
background-color $ui-noteList-backgroundColor background-color $ui-noteList-backgroundColor
border 1px solid $border-color box-shadow 2px 12px 15px 2px rgba(0, 0, 0, 0.1), 2px 1px 50px 2px rgba(0, 0, 0, 0.1)
border-radius 2px
.count-wrap .count-wrap
display flex display flex
@@ -124,11 +125,9 @@
body[data-theme="dark"] body[data-theme="dark"]
.control-infoButton-panel .control-infoButton-panel
background-color $ui-dark-noteList-backgroundColor background-color $ui-dark-noteList-backgroundColor
border 1px solid alpha($ui-dark-borderColor, 40%)
.control-infoButton-panel-trash .control-infoButton-panel-trash
background-color $ui-dark-noteList-backgroundColor background-color $ui-dark-noteList-backgroundColor
border 1px solid $ui-dark-borderColor
.modification-date .modification-date
color $ui-dark-text-color color $ui-dark-text-color

36
browser/main/NoteList/index.js
View File

@@ -488,24 +488,24 @@ class NoteList extends React.Component {
if (note.isTrashed !== true || location.pathname === '/trashed') return true if (note.isTrashed !== true || location.pathname === '/trashed') return true
}) })
moment.locale('en', { moment.locale('en', {
relativeTime: { relativeTime: {
future: 'in %s', future: 'in %s',
past: '%s ago', past: '%s ago',
s: '%ds', s: '%ds',
ss: '%ss', ss: '%ss',
m: '1m', m: '1m',
mm: '%dm', mm: '%dm',
h: 'an hour', h: 'an hour',
hh: '%dh', hh: '%dh',
d: '1 d', d: '1d',
dd: '%dd', dd: '%dd',
M: 'a month', M: '1M',
MM: '%dM', MM: '%dM',
y: 'a year', y: '1Y',
yy: '%dY' yy: '%dY'
} }
}); })
let noteList = notes let noteList = notes
.map(note => { .map(note => {