Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix progress bar UI at NoteItem
  • Loading branch information
Kazu Yokomizo committed Aug 12, 2017
commit 076edd375fe8446677b2368a090d4f0d04dda843
8 changes: 4 additions & 4 deletions browser/components/NoteItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ const NoteItem = ({ isActive, note, dateDisplay, handleNoteClick, handleDragStar
{note.isStarred
? <i styleName='item-star' className='fa fa-star' /> : ''
}
{note.type === 'MARKDOWN_NOTE'
? <TodoProcess todoStatus={getTodoStatus(note.content)} />
: ''
}
<div styleName='item-bottom'>
<div styleName='item-bottom-tagList'>
{note.tags.length > 0
Expand All @@ -78,10 +82,6 @@ const NoteItem = ({ isActive, note, dateDisplay, handleNoteClick, handleDragStar
}
</div>
</div>
{note.type === 'MARKDOWN_NOTE'
? <TodoProcess todoStatus={getTodoStatus(note.content)} />
: ''
}
</div>
</div>
)
Expand Down
4 changes: 2 additions & 2 deletions browser/components/NoteItem.styl
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ $control-height = 30px

.item-star
position absolute
right 5px
bottom 0px
right -20px
bottom 2px
width 34px
height 34px
color alpha($ui-favorite-star-button-color, 60%)
Expand Down
2 changes: 1 addition & 1 deletion browser/components/TodoProcess.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const TodoProcess = ({
}) => (
<div styleName='todo-process' style={{display: totalTodo > 0 ? '' : 'none'}}>
<div styleName='todo-process-text'>
<i className='fa fa-fw fa-tasks' />
<i className='fa fa-fw fa-check-square-o' />
{completedTodo} of {totalTodo}
</div>
<div styleName='todo-process-bar'>
Expand Down
15 changes: 12 additions & 3 deletions browser/components/TodoProcess.styl
Original file line number Diff line number Diff line change
@@ -1,36 +1,45 @@
.todo-process
font-size 12px
display flex
padding-top 15px
width 85%

.todo-process-text
display inline-block
padding-right 10px
white-space nowrap
text-overflow ellipsis
color $ui-inactive-text-color
i
color grey
color $ui-inactive-text-color
padding-right 5px

.todo-process-bar
display inline-block
margin auto
width 150px
height 5px
height 4px
border-radius 10px
background-color #DADFE1
border-radius 2px
flex-grow 1
border 1px solid alpha(#6C7A89, 10%)

.todo-process-bar--inner
height 100%
border-radius 5px
background-color #6C7A89
transition 0.3s


body[data-theme="dark"]
.todo-process
color $ui-dark-text-color

.todo-process-bar
background-color #363A3D

.todo-process-text
color $ui-inactive-text-color

.todo-process-bar--inner
background-color: alpha(#939395, 50%)