From 6f359fa6a87e648bcbd5a43c127cb51e47715cd8 Mon Sep 17 00:00:00 2001 From: Yutaka Ishii Date: Thu, 7 Dec 2017 15:14:10 +0900 Subject: [PATCH] color setting --- browser/components/TodoListPercentage.styl | 4 ++-- browser/main/Detail/MarkdownNoteDetail.styl | 2 +- browser/main/NoteList/NoteList.styl | 2 +- browser/main/SideNav/SideNav.styl | 4 ++-- browser/styles/index.styl | 10 ++++++---- resources/icon/icon-info.svg | 8 ++++---- resources/icon/icon-sidebar.svg | 2 +- resources/icon/icon-star.svg | 14 ++++++++------ 8 files changed, 25 insertions(+), 21 deletions(-) diff --git a/browser/components/TodoListPercentage.styl b/browser/components/TodoListPercentage.styl index 66fc62ee..a5141130 100644 --- a/browser/components/TodoListPercentage.styl +++ b/browser/components/TodoListPercentage.styl @@ -23,10 +23,10 @@ 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 \ No newline at end of file diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl index 4c001031..33168bb6 100644 --- a/browser/main/Detail/MarkdownNoteDetail.styl +++ b/browser/main/Detail/MarkdownNoteDetail.styl @@ -42,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() diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl index 8332eefb..37bcea41 100644 --- a/browser/main/NoteList/NoteList.styl +++ b/browser/main/NoteList/NoteList.styl @@ -3,7 +3,7 @@ $control-height = 30px .root absolute left bottom top $topBar-height - 1 - background-color $ui-noteList-backgroundColor + background-color $ui-dark-backgroundColor .control absolute top left right diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index d42076da..196f68ab 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -1,7 +1,7 @@ .root absolute top left bottom width $sideNav-width - background-color #2E3235 + background-color $ui-dark-backgroundColor user-select none color $ui-text-color height: 100vh @@ -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 diff --git a/browser/styles/index.styl b/browser/styles/index.styl index f252a002..4787e975 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -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 = #282828 +$ui-dark-backgroundColor = #151915 +$ui-dark-noteList-backgroundColor = #151915 +$ui-dark-noteDetail-backgroundColor = #151915 + $ui-dark-tag-backgroundColor = #3A404C $dark-background-color = lighten($ui-dark-backgroundColor, 10%) $ui-dark-text-color = #DDDDDD diff --git a/resources/icon/icon-info.svg b/resources/icon/icon-info.svg index bd808f8c..253b8cab 100644 --- a/resources/icon/icon-info.svg +++ b/resources/icon/icon-info.svg @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/resources/icon/icon-sidebar.svg b/resources/icon/icon-sidebar.svg index 619c4ea3..da4a0926 100644 --- a/resources/icon/icon-sidebar.svg +++ b/resources/icon/icon-sidebar.svg @@ -8,7 +8,7 @@ - + diff --git a/resources/icon/icon-star.svg b/resources/icon/icon-star.svg index 3318a7e7..cda4af25 100644 --- a/resources/icon/icon-star.svg +++ b/resources/icon/icon-star.svg @@ -1,15 +1,17 @@ - icon-star-24 + icon-star Created with Sketch. - - - - - + + + + + + +