From 657d69a0fb7b3df8317c3db799a8eeada6d2145a Mon Sep 17 00:00:00 2001 From: Kazu Yokomizo Date: Fri, 7 Apr 2017 15:25:59 +0900 Subject: [PATCH] Fix the dark theme layout at NoteList --- browser/components/NoteItem.styl | 12 ++++++++---- browser/components/NoteItemSimple.styl | 9 ++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/browser/components/NoteItem.styl b/browser/components/NoteItem.styl index 2e643789..2934eab7 100644 --- a/browser/components/NoteItem.styl +++ b/browser/components/NoteItem.styl @@ -11,7 +11,7 @@ $control-height = 30px user-select none cursor pointer background-color $ui-noteList-backgroundColor - transition background-color 0.15s + transition background-color 0.2s &:hover background-color alpha($ui-button--active-backgroundColor, 40%) &:active @@ -141,6 +141,10 @@ body[data-theme="dark"] border-color transparent .item-title color white + .item-title-icon + color white + .item-bottom-time + color white .item-bottom-tagList-item background-color transparent color white @@ -150,13 +154,13 @@ body[data-theme="dark"] background-color $ui-dark-button--active-backgroundColor .item-title - color $ui-dark-text-color + color $ui-inactive-text-color .item-title-icon - color $ui-darkinactive-text-color + color $ui-inactive-text-color .item-title-empty - color $ui-dark-inactive-text-color + color $ui-inactive-text-color .item-bottom-tagList-item background-color $ui-dark-tag-backgroundColor diff --git a/browser/components/NoteItemSimple.styl b/browser/components/NoteItemSimple.styl index a51deb17..c07c1817 100644 --- a/browser/components/NoteItemSimple.styl +++ b/browser/components/NoteItemSimple.styl @@ -63,6 +63,7 @@ body[data-theme="dark"] border-color $ui-dark-borderColor background-color $ui-dark-noteList-backgroundColor &:active + color white background-color $ui-dark-button--active-backgroundColor &:hover background-color alpha($ui-dark-button--active-backgroundColor, 20%) @@ -71,15 +72,21 @@ body[data-theme="dark"] @extend .item-simple border-color $ui-dark-borderColor background-color $ui-dark-button--active-backgroundColor + color white .item-simple-title + color white + .item-simple-title-icon + color white .item-simple-title-empty color white border-color transparent + &:active + color white &:hover background-color $ui-dark-button--active-backgroundColor .item-simple-title - color $ui-dark-text-color + color $ui-inactive-text-color border-color $ui-dark-borderColor .item-simple-title-icon