From 16177754d5690a226ab4b1057bfb81ac974c8aa9 Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 24 Sep 2018 17:16:56 +0200 Subject: [PATCH 1/4] fixed togglemodebutton styling --- browser/main/Detail/ToggleModeButton.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/Detail/ToggleModeButton.styl b/browser/main/Detail/ToggleModeButton.styl index 2e7ab5fa..684f8235 100644 --- a/browser/main/Detail/ToggleModeButton.styl +++ b/browser/main/Detail/ToggleModeButton.styl @@ -59,7 +59,7 @@ body[data-theme="solarized-dark"] body[data-theme="monokai"] .control-toggleModeButton - background-color #272822 + background-color #373831 .active background-color #1EC38B box-shadow 2px 0px 7px #222222 From 0c1497a255d89092136a15bec3062ed70eb1927c Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 24 Sep 2018 17:45:28 +0200 Subject: [PATCH 2/4] Updated NoteItem Styling, fixed NoteItemSimple styling, Changed the tag color based on the monokai color palette, --- browser/components/NoteItem.styl | 4 ++-- browser/components/NoteItemSimple.styl | 2 +- browser/main/Detail/TagSelect.styl | 4 ++-- browser/styles/index.styl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/components/NoteItem.styl b/browser/components/NoteItem.styl index 017ef6d0..e545ed99 100644 --- a/browser/components/NoteItem.styl +++ b/browser/components/NoteItem.styl @@ -368,13 +368,13 @@ body[data-theme="monokai"] .item-title .item-title-icon .item-bottom-time - color $ui-monokai-text-color + color $ui-monokai-active-color .item-bottom-tagList-item background-color alpha(white, 10%) color $ui-monokai-text-color &:hover // background-color alpha($ui-monokai-button--active-backgroundColor, 60%) - color #c0392b + color #f92672 .item-bottom-tagList-item background-color alpha(#fff, 20%) diff --git a/browser/components/NoteItemSimple.styl b/browser/components/NoteItemSimple.styl index 04f57fdc..4bb6f2b1 100644 --- a/browser/components/NoteItemSimple.styl +++ b/browser/components/NoteItemSimple.styl @@ -240,7 +240,7 @@ body[data-theme="monokai"] .item-simple-title-icon .item-simple-bottom-time transition 0.15s - color $ui-solarized-dark-text-color + color $ui-monokai-text-color .item-simple-bottom-tagList-item transition 0.15s background-color alpha(#fff, 20%) diff --git a/browser/main/Detail/TagSelect.styl b/browser/main/Detail/TagSelect.styl index 7dc9dfe4..1b9e20d1 100644 --- a/browser/main/Detail/TagSelect.styl +++ b/browser/main/Detail/TagSelect.styl @@ -67,11 +67,11 @@ body[data-theme="solarized-dark"] body[data-theme="monokai"] .tag - background-color $ui-monokai-button-backgroundColor + background-color $ui-monokai-tag-backgroundColor .tag-removeButton border-color $ui-button--focus-borderColor background-color transparent .tag-label - color $ui-monokai-text-color \ No newline at end of file + color $ui-monokai-borderColor \ No newline at end of file diff --git a/browser/styles/index.styl b/browser/styles/index.styl index a490b41c..190aa6ee 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -369,7 +369,7 @@ $ui-monokai-active-color = #f92672 $ui-monokai-borderColor = #373831 -$ui-monokai-tag-backgroundColor = #f92672 +$ui-monokai-tag-backgroundColor = #A6E22E $ui-monokai-button-backgroundColor = #373831 $ui-monokai-button--active-color = white From 2a44e0b7eb2e3b0f99e22da65f3d2a536b72de5a Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 24 Sep 2018 17:52:26 +0200 Subject: [PATCH 3/4] updated the toggleModeButton styling --- browser/main/Detail/ToggleModeButton.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/Detail/ToggleModeButton.styl b/browser/main/Detail/ToggleModeButton.styl index 684f8235..7ede0576 100644 --- a/browser/main/Detail/ToggleModeButton.styl +++ b/browser/main/Detail/ToggleModeButton.styl @@ -61,5 +61,5 @@ body[data-theme="monokai"] .control-toggleModeButton background-color #373831 .active - background-color #1EC38B + background-color #f92672 box-shadow 2px 0px 7px #222222 From b3ede3230c78eac1cbf04740603cc2c50ed7aa8b Mon Sep 17 00:00:00 2001 From: William Grant Date: Fri, 28 Sep 2018 17:53:13 +0200 Subject: [PATCH 4/4] Fixed the TodoListPercentage styling, reverted tag color back to the default button color --- browser/components/TodoListPercentage.styl | 8 ++++---- browser/main/Detail/TagSelect.styl | 2 +- browser/styles/index.styl | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/components/TodoListPercentage.styl b/browser/components/TodoListPercentage.styl index 6116cd58..94e75599 100644 --- a/browser/components/TodoListPercentage.styl +++ b/browser/components/TodoListPercentage.styl @@ -39,7 +39,7 @@ body[data-theme="dark"] .percentageText color $ui-dark-text-color - + body[data-theme="solarized-dark"] .percentageBar background-color #002b36 @@ -52,10 +52,10 @@ body[data-theme="solarized-dark"] body[data-theme="monokai"] .percentageBar - background-color #f92672 + background-color: $ui-monokai-borderColor .progressBar - background-color: #373831 + background-color $ui-monokai-active-color .percentageText - color #fdf6e3 \ No newline at end of file + color $ui-monokai-text-color \ No newline at end of file diff --git a/browser/main/Detail/TagSelect.styl b/browser/main/Detail/TagSelect.styl index 1b9e20d1..f5c2f519 100644 --- a/browser/main/Detail/TagSelect.styl +++ b/browser/main/Detail/TagSelect.styl @@ -74,4 +74,4 @@ body[data-theme="monokai"] background-color transparent .tag-label - color $ui-monokai-borderColor \ No newline at end of file + color $ui-monokai-text-color \ No newline at end of file diff --git a/browser/styles/index.styl b/browser/styles/index.styl index 190aa6ee..266426c0 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -369,7 +369,7 @@ $ui-monokai-active-color = #f92672 $ui-monokai-borderColor = #373831 -$ui-monokai-tag-backgroundColor = #A6E22E +$ui-monokai-tag-backgroundColor = #373831 $ui-monokai-button-backgroundColor = #373831 $ui-monokai-button--active-color = white