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
4 changes: 2 additions & 2 deletions browser/components/SideNavFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const SideNavFilter = ({
<div styleName='iconWrap'>
<img src={isStarredActive
? '../resources/icon/icon-star-active.svg'
: '../resources/icon/icon-star.svg'
: '../resources/icon/icon-star-sidenav.svg'
}
/>
</div>
Expand All @@ -55,7 +55,7 @@ const SideNavFilter = ({
<div styleName='iconWrap'>
<img src={isTrashedActive
? '../resources/icon/icon-trash-active.svg'
: '../resources/icon/icon-trash.svg'
: '../resources/icon/icon-trash-sidenav.svg'
}
/>
</div>
Expand Down
4 changes: 3 additions & 1 deletion browser/components/TodoListPercentage.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const TodoListPercentage = ({
}) => (
<div styleName='percentageBar' style={{display: isNaN(percentageOfTodo) ? 'none' : ''}}>
<div styleName='progressBar' style={{width: `${percentageOfTodo}%`}}>
<p styleName='percentageText'>{percentageOfTodo}%</p>
<div styleName='progressBarInner'>
<p styleName='percentageText'>{percentageOfTodo}%</p>
</div>
</div>
</div>
)
Expand Down
15 changes: 12 additions & 3 deletions browser/components/TodoListPercentage.styl
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,26 @@
border-radius 2px
transition 0.4s cubic-bezier(0.4, 0.4, 0, 1)

.progressBarInner
padding 0 10px
min-width 1px
height 100%
display -webkit-box
display box
justify-content center
align-items center


.percentageText
color #f4f4f4
padding: 2px 43%
font-weight 600

body[data-theme="dark"]
.percentageBar
background-color #363A3D
background-color #444444

.progressBar
background-color: alpha(#939395, 50%)
background-color: #1EC38B

.percentageText
color $ui-dark-text-color
3 changes: 1 addition & 2 deletions browser/main/Detail/InfoButton.styl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
.control-infoButton
top 10px
margin-bottom 10px
topBarButtonLight()
topBarButtonRight()

.infoButton
padding 0px
Expand Down
6 changes: 3 additions & 3 deletions browser/main/Detail/MarkdownNoteDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class MarkdownNoteDetail extends React.Component {
}

getToggleLockButton () {
return this.state.isLocked ? '../resources/icon/icon-lock.svg' : '../resources/icon/icon-unlock.svg'
return this.state.isLocked ? '../resources/icon/icon-edit-lock.svg' : '../resources/icon/icon-edit.svg'
}

handleDeleteKeyDown (e) {
Expand Down Expand Up @@ -392,8 +392,8 @@ class MarkdownNoteDetail extends React.Component {
</div>

<StatusBar
{..._.pick(this.props, ['config', 'location', 'dispatch'])}
date={note.updatedAt}
{..._.pick(this.props, ['config', 'location', 'dispatch'])}
date={note.updatedAt}
/>
</div>
)
Expand Down
9 changes: 4 additions & 5 deletions browser/main/Detail/MarkdownNoteDetail.styl
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@
padding-bottom 3px

.control-lockButton
top 160px
margin-bottom 10px
topBarButtonLight()
top 150px
topBarButtonRight()

.trashed-infopanel
top 40px
position relative

.control-fullScreenButton
top 80px
topBarButtonLight()
topBarButtonRight()

.body
absolute left right
Expand All @@ -43,7 +42,7 @@ body[data-theme="dark"]
.root
background-color $ui-dark-noteDetail-backgroundColor
box-shadow none
border none
border-left 1px solid $ui-dark-borderColor

.control-lockButton
topBarButtonDark()
Expand Down
2 changes: 1 addition & 1 deletion browser/main/Detail/SnippetNoteDetail.styl
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
.control-fullScreenButton
top 80px
margin-bottom 10px
topBarButtonLight()
topBarButtonRight()

body[data-theme="white"]
.root
Expand Down
2 changes: 1 addition & 1 deletion browser/main/Detail/StarButton.styl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.root
top 45px
topBarButtonLight()
topBarButtonRight()
&:hover
transition 0.2s
color alpha($ui-favorite-star-button-color, 0.6)
Expand Down
7 changes: 3 additions & 4 deletions browser/main/Detail/TrashButton.styl
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
.control-trashButton
top 120px
margin-bottom 10px
topBarButtonLight()
top 115px
topBarButtonRight()

.control-trashButton--in-trash
top 60px
topBarButtonLight()
topBarButtonRight()

.trashButton
padding 0px
Expand Down
2 changes: 1 addition & 1 deletion browser/main/SideNav/SideNav.styl
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ body[data-theme="white"]

body[data-theme="dark"]
.root, .root--folded
border-color $ui-dark-borderColor
border-right 1px solid $ui-dark-borderColor
background-color $ui-dark-backgroundColor
color $ui-dark-text-color

Expand Down
16 changes: 9 additions & 7 deletions browser/styles/index.styl
Original file line number Diff line number Diff line change
Expand Up @@ -174,20 +174,20 @@ modal()
overflow hidden
border-radius $modal-border-radius

topBarButtonLight()
topBarButtonRight()
position absolute
width 34px
height 34px
border-radius 17px
font-size 14px
border none
color alpha($ui-button-color, 0.4)
color alpha($ui-button-color, 0.2)
fill $ui-button-color
background-color transparent
&:active
border-color $ui-button--active-backgroundColor
&:hover
transform scale(1.1)
// transform scale(1.1)
transition 0.4s
color $ui-button-color
.control-lockButton-tooltip
Expand Down Expand Up @@ -223,10 +223,12 @@ $ui-button--focus-borderColor = lighten(#369DCD, 25%)

/******* Dark theme ********/
$ui-dark-active-color = #3A404C
$ui-dark-borderColor = lighten(#21252B, 20%)
$ui-dark-backgroundColor = #1E2124
$ui-dark-noteList-backgroundColor = #282C30
$ui-dark-noteDetail-backgroundColor = #2D3033

$ui-dark-borderColor = #444444
$ui-dark-backgroundColor = #2C3033
$ui-dark-noteList-backgroundColor = #2C3033
$ui-dark-noteDetail-backgroundColor = #2C3033

$ui-dark-tag-backgroundColor = #3A404C
$dark-background-color = lighten($ui-dark-backgroundColor, 10%)
$ui-dark-text-color = #DDDDDD
Expand Down
13 changes: 13 additions & 0 deletions resources/icon/icon-edit-lock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions resources/icon/icon-edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions resources/icon/icon-info-24.svg

This file was deleted.

8 changes: 4 additions & 4 deletions resources/icon/icon-info.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 0 additions & 18 deletions resources/icon/icon-sidebar-24.svg

This file was deleted.

2 changes: 1 addition & 1 deletion resources/icon/icon-sidebar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 0 additions & 18 deletions resources/icon/icon-star-24.svg

This file was deleted.

20 changes: 20 additions & 0 deletions resources/icon/icon-star-sidenav.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 8 additions & 12 deletions resources/icon/icon-star.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 0 additions & 18 deletions resources/icon/icon-starred-24.svg

This file was deleted.

Loading