From 0b2b89da0f067207a09a53ba7629eeca268e6891 Mon Sep 17 00:00:00 2001 From: Kazu Yokomizo Date: Fri, 24 Nov 2017 12:26:28 +0900 Subject: [PATCH 1/4] Fix CI error --- browser/main/Detail/FolderSelect.js | 4 ++-- browser/main/Detail/TagSelect.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/main/Detail/FolderSelect.js b/browser/main/Detail/FolderSelect.js index 4329c270..49f84098 100644 --- a/browser/main/Detail/FolderSelect.js +++ b/browser/main/Detail/FolderSelect.js @@ -261,9 +261,9 @@ class FolderSelect extends React.Component { :
- + - {currentOption.folder.name} + {currentOption.folder.name}
diff --git a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js index 851696c2..d44d4ab3 100644 --- a/browser/main/Detail/TagSelect.js +++ b/browser/main/Detail/TagSelect.js @@ -113,7 +113,7 @@ class TagSelect extends React.Component { ) From aeb27f7bff186981b47a08cc6c19c199d814ca7a Mon Sep 17 00:00:00 2001 From: Kazu Yokomizo Date: Fri, 24 Nov 2017 12:26:39 +0900 Subject: [PATCH 2/4] Fix font color in note detail --- browser/components/MarkdownPreview.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 8f0e1d02..9ce1fcd6 100644 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -92,7 +92,6 @@ h2 { body p { white-space: normal; - color: rgba(0,0,0,.84); } ` } From 179b830d140e69382738586df557e4120c7de17e Mon Sep 17 00:00:00 2001 From: Kazu Yokomizo Date: Fri, 24 Nov 2017 12:31:45 +0900 Subject: [PATCH 3/4] Fix layout at statusbar in snippet note detail --- browser/main/Detail/SnippetNoteDetail.styl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl index ea327d58..e661d07c 100644 --- a/browser/main/Detail/SnippetNoteDetail.styl +++ b/browser/main/Detail/SnippetNoteDetail.styl @@ -55,8 +55,7 @@ .override absolute bottom left - bottom 5px - height 18px + bottom 1px left 60px z-index 101 button From 16e1f0f882b8b35f281681cfb19c23c09be05d58 Mon Sep 17 00:00:00 2001 From: Kazu Yokomizo Date: Fri, 24 Nov 2017 12:43:04 +0900 Subject: [PATCH 4/4] Fix zoom icon color --- browser/main/StatusBar/StatusBar.styl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/main/StatusBar/StatusBar.styl b/browser/main/StatusBar/StatusBar.styl index d005cb2e..9f189fec 100644 --- a/browser/main/StatusBar/StatusBar.styl +++ b/browser/main/StatusBar/StatusBar.styl @@ -5,7 +5,6 @@ bottom 10px right 10px z-index 100 - background-color $ui-noteDetail-backgroundColor display flex .blank @@ -28,6 +27,7 @@ display flex padding 0 align-items center + background-color transparent &:hover color $ui-active-color &:active @@ -49,14 +49,14 @@ body[data-theme="dark"] .root - background-color $ui-dark-noteDetail-backgroundColor border-color $ui-dark-borderColor box-shadow none .zoom border-color $ui-dark-borderColor + background-color transparent + color #f9f9f9 &:hover - background-color alpha($ui-dark-button--active-backgroundColor, 20%) transition 0.15s color $ui-dark-text-color