diff --git a/browser/components/NoteItem.styl b/browser/components/NoteItem.styl index 02c8b65c..f1eda977 100644 --- a/browser/components/NoteItem.styl +++ b/browser/components/NoteItem.styl @@ -231,3 +231,77 @@ body[data-theme="dark"] .item-bottom-tagList-empty color $ui-inactive-text-color vertical-align middle + + +body[data-theme="solarized-dark"] + .root + border-color $ui-solarized-dark-borderColor + background-color $ui-solarized-dark-noteList-backgroundColor + + .item + border-color $ui-solarized-dark-borderColor + background-color $ui-solarized-dark-noteList-backgroundColor + &:hover + transition 0.15s + // background-color alpha($ui-solarized-dark-noteList-backgroundColor, 20%) + color $ui-solarized-dark-text-color + .item-title + .item-title-icon + .item-bottom-time + transition 0.15s + color $ui-solarized-dark-text-color + .item-bottom-tagList-item + transition 0.15s + background-color alpha($ui-solarized-dark-noteList-backgroundColor, 20%) + color $ui-solarized-dark-text-color + &:active + transition 0.15s + background-color $ui-solarized-dark-noteList-backgroundColor + color $ui-solarized-dark-text-color + .item-title + .item-title-icon + .item-bottom-time + transition 0.15s + color $ui-solarized-dark-text-color + .item-bottom-tagList-item + transition 0.15s + background-color alpha($ui-solarized-dark-noteList-backgroundColor, 10%) + color $ui-solarized-dark-text-color + + .item-wrapper + border-color alpha($ui-solarized-dark-button--active-backgroundColor, 60%) + + .item--active + border-color $ui-solarized-dark-borderColor + background-color $ui-solarized-dark-button--active-backgroundColor + .item-wrapper + border-color transparent + .item-title + .item-title-icon + .item-bottom-time + color $ui-solarized-dark-text-color + .item-bottom-tagList-item + background-color alpha(white, 10%) + color $ui-solarized-dark-text-color + &:hover + // background-color alpha($ui-solarized-dark-button--active-backgroundColor, 60%) + color #c0392b + .item-bottom-tagList-item + background-color alpha(#fff, 20%) + + .item-title + color $ui-inactive-text-color + + .item-title-icon + color $ui-inactive-text-color + + .item-title-empty + color $ui-inactive-text-color + + .item-bottom-tagList-item + background-color alpha($ui-dark-button--active-backgroundColor, 40%) + color $ui-inactive-text-color + + .item-bottom-tagList-empty + color $ui-inactive-text-color + vertical-align middle \ No newline at end of file diff --git a/browser/components/NoteItemSimple.styl b/browser/components/NoteItemSimple.styl index fdfed1ab..d86b3cbd 100644 --- a/browser/components/NoteItemSimple.styl +++ b/browser/components/NoteItemSimple.styl @@ -143,3 +143,57 @@ body[data-theme="dark"] .item-simple-title-empty color $ui-dark-inactive-text-color + + +body[data-theme="solarized-dark"] + .root + border-color $ui-solarized-dark-borderColor + background-color $ui-solarized-dark-noteList-backgroundColor + + .item-simple + border-color $ui-solarized-dark-borderColor + background-color $ui-solarized-dark-noteList-backgroundColor + &:hover + transition 0.15s + // background-color alpha($ui-dark-button--active-backgroundColor, 20%) + color $ui-solarized-dark-text-color + .item-simple-title + .item-simple-title-icon + .item-simple-bottom-time + transition 0.15s + color $ui-solarized-dark-text-color + .item-simple-bottom-tagList-item + transition 0.15s + background-color alpha(#fff, 20%) + color $ui-solarized-dark-text-color + &:active + transition 0.15s + background-color $ui-solarized-dark-button--active-backgroundColor + color $ui-solarized-dark-text-color + .item-simple-title + .item-simple-title-icon + .item-simple-bottom-time + transition 0.15s + color $ui-solarized-dark-text-color + .item-simple-bottom-tagList-item + transition 0.15s + background-color alpha(white, 10%) + color $ui-solarized-dark-text-color + + .item-simple--active + border-color $ui-solarized-dark-borderColor + background-color $ui-solarized-dark-button--active-backgroundColor + .item-simple-wrapper + border-color transparent + .item-simple-title + .item-simple-title-icon + .item-simple-bottom-time + color $ui-solarized-dark-text-color + .item-simple-bottom-tagList-item + background-color alpha(white, 10%) + color $ui-solarized-dark-text-color + &:hover + // background-color alpha($ui-dark-button--active-backgroundColor, 60%) + color #c0392b + .item-simple-bottom-tagList-item + background-color alpha(#fff, 20%) \ No newline at end of file diff --git a/browser/components/SideNavFilter.styl b/browser/components/SideNavFilter.styl index e012dcaa..009aff62 100644 --- a/browser/components/SideNavFilter.styl +++ b/browser/components/SideNavFilter.styl @@ -182,4 +182,25 @@ body[data-theme="dark"] background-color alpha($ui-dark-button--active-backgroundColor, 50%) color #5D9E36 .menu-button-label - color $ui-dark-text-color \ No newline at end of file + color $ui-dark-text-color + + +body[data-theme="solarized-dark"] + .menu-button + &:active + background-color $ui-solarized-dark-noteList-backgroundColor + color $ui-solarized-dark-text-color + &:hover + // background-color alpha($ui-solarized-dark-button--active-backgroundColor, 20%) + color $ui-solarized-dark-text-color + + .menu-button--active + color #c0392b + background-color $ui-solarized-dark-noteList-backgroundColor + .menu-button-label + color $ui-solarized-dark-text-color + &:hover + // background-color alpha($ui-solarized-dark-button--active-backgroundColor, 50%) + color #c0392b + .menu-button-label + color $ui-solarized-dark-text-color diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl index 89bbf0ab..bd1d409a 100644 --- a/browser/components/markdown.styl +++ b/browser/components/markdown.styl @@ -332,4 +332,9 @@ body[data-theme="dark"] border-right solid 1px themeDarkTableBorder kbd background-color themeDarkBorder - color themeDarkText \ No newline at end of file + color themeDarkText + +body[data-theme="solarized-dark"] + color themeDarkText + border-color themeDarkBorder + background-color $ui-solarized-dark-noteDetail-backgroundColor \ No newline at end of file diff --git a/browser/finder/ipcClient.js b/browser/finder/ipcClient.js index d87bc6a3..1be83c50 100644 --- a/browser/finder/ipcClient.js +++ b/browser/finder/ipcClient.js @@ -86,6 +86,8 @@ nodeIpc.connectTo( document.body.setAttribute('data-theme', 'dark') } else if (config.ui.theme === 'white') { document.body.setAttribute('data-theme', 'white') + } else if (config.ui.theme === 'solarized-dark') { + document.body.setAttribute('data-theme', 'solarized-dark') } else { document.body.setAttribute('data-theme', 'default') } diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl index 597447eb..22de44dd 100644 --- a/browser/main/Detail/MarkdownNoteDetail.styl +++ b/browser/main/Detail/MarkdownNoteDetail.styl @@ -53,3 +53,7 @@ body[data-theme="dark"] .control-fullScreenButton topBarButtonDark() + +body[data-theme="solarized-dark"] + .root + background-color $ui-solarized-dark-noteDetail-backgroundColor \ No newline at end of file diff --git a/browser/main/Detail/NoteDetailInfo.styl b/browser/main/Detail/NoteDetailInfo.styl index a9261bd0..433c1f2f 100644 --- a/browser/main/Detail/NoteDetailInfo.styl +++ b/browser/main/Detail/NoteDetailInfo.styl @@ -95,4 +95,9 @@ body[data-theme="dark"] background-color $ui-dark-noteDetail-backgroundColor .undo-button - topBarButtonDark() \ No newline at end of file + topBarButtonDark() + +body[data-theme="solarized-dark"] + .info + border-color $ui-solarized-dark-borderColor + background-color $ui-solarized-dark-noteDetail-backgroundColor diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl index e661d07c..df8132a7 100644 --- a/browser/main/Detail/SnippetNoteDetail.styl +++ b/browser/main/Detail/SnippetNoteDetail.styl @@ -109,3 +109,19 @@ body[data-theme="dark"] .control-fullScreenButton topBarButtonDark() + +body[data-theme="solarized-dark"] + .root + background-color $ui-solarized-dark-noteDetail-backgroundColor + + .body + background-color $ui-solarized-dark-noteDetail-backgroundColor + + .body .description textarea + background-color $ui-solarized-dark-noteDetail-backgroundColor + color $ui-solarized-dark-text-color + border 1px solid $ui-solarized-dark-borderColor + + .tabList + background-color $ui-solarized-dark-noteDetail-backgroundColor + color $ui-solarized-dark-text-color \ No newline at end of file diff --git a/browser/main/Main.js b/browser/main/Main.js index 39292e35..3fefdb45 100644 --- a/browser/main/Main.js +++ b/browser/main/Main.js @@ -55,6 +55,8 @@ class Main extends React.Component { document.body.setAttribute('data-theme', 'dark') } else if (config.ui.theme === 'white') { document.body.setAttribute('data-theme', 'white') + } else if (config.ui.theme === 'solarized-dark') { + document.body.setAttribute('data-theme', 'solarized-dark') } else { document.body.setAttribute('data-theme', 'default') } diff --git a/browser/main/NewNoteButton/NewNoteButton.styl b/browser/main/NewNoteButton/NewNoteButton.styl index cb49501c..81ff7e8d 100644 --- a/browser/main/NewNoteButton/NewNoteButton.styl +++ b/browser/main/NewNoteButton/NewNoteButton.styl @@ -71,3 +71,7 @@ body[data-theme="dark"] .control-newNoteButton-tooltip darkTooltip() + +body[data-theme="solarized-dark"] + .root, .root--expanded + background-color $ui-solarized-dark-noteList-backgroundColor \ No newline at end of file diff --git a/browser/main/NoteList/NoteList.styl b/browser/main/NoteList/NoteList.styl index 8332eefb..312f5143 100644 --- a/browser/main/NoteList/NoteList.styl +++ b/browser/main/NoteList/NoteList.styl @@ -88,4 +88,29 @@ body[data-theme="dark"] .control-button--active color $ui-dark-text-color &:active - color $ui-dark-text-color \ No newline at end of file + color $ui-dark-text-color + + +body[data-theme="solarized-dark"] + .root + border-color $ui-solarized-dark-borderColor + background-color $ui-solarized-dark-noteList-backgroundColor + + .control + background-color $ui-solarized-dark-noteList-backgroundColor + border-color $ui-solarized-dark-borderColor + + .control-sortBy-select + &:hover + transition 0.2s + color $ui-solarized-dark-text-color + + .control-button + color $ui-solarized-dark-inactive-text-color + &:hover + color $ui-solarized-dark-text-color + + .control-button--active + color $ui-solarized-dark-text-color + &:active + color $ui-solarized-dark-text-color \ No newline at end of file diff --git a/browser/main/SideNav/SideNav.styl b/browser/main/SideNav/SideNav.styl index d42076da..607a3f22 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -163,3 +163,7 @@ body[data-theme="dark"] .tag-title p color alpha($ui-dark-text-color, 60%) + +body[data-theme="solarized-dark"] + .root, .root--folded + background-color $ui-dark-backgroundColor diff --git a/browser/main/TopBar/TopBar.styl b/browser/main/TopBar/TopBar.styl index 3e5a7275..eb0fc12f 100644 --- a/browser/main/TopBar/TopBar.styl +++ b/browser/main/TopBar/TopBar.styl @@ -185,3 +185,26 @@ body[data-theme="dark"] .control-newPostButton-tooltip darkTooltip() + + +body[data-theme="solarized-dark"] + .root, .root--expanded + background-color $ui-solarized-dark-noteList-backgroundColor + + .control + border-color $ui-solarized-dark-borderColor + .control-search + background-color $ui-solarized-dark-noteList-backgroundColor + + .control-search-icon + absolute top bottom left + line-height 32px + width 35px + color $ui-solarized-dark-inactive-text-color + background-color $ui-solarized-dark-noteList-backgroundColor + + .control-search-input + background-color $ui-solarized-dark-noteList-backgroundColor + input + background-color $ui-solarized-dark-noteList-backgroundColor + color $ui-solarized-dark-text-color \ No newline at end of file diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index e8f7253e..c49594b9 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -114,6 +114,8 @@ function set (updates) { document.body.setAttribute('data-theme', 'dark') } else if (newConfig.ui.theme === 'white') { document.body.setAttribute('data-theme', 'white') + } else if (newConfig.ui.theme === 'solarized-dark') { + document.body.setAttribute('data-theme', 'solarized-dark') } else { document.body.setAttribute('data-theme', 'default') } diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index b85eafdb..66f58ade 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -145,6 +145,7 @@ class UiTab extends React.Component { > + diff --git a/browser/styles/index.styl b/browser/styles/index.styl index d2c32b88..2c3381ac 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -307,3 +307,21 @@ modalDark() background-color $ui-dark-backgroundColor overflow hidden border-radius $modal-border-radius + + +/******* Solarized Dark theme ********/ +$ui-solarized-dark-backgroundColor = #2E3235 +$ui-solarized-dark-noteList-backgroundColor = #002B36 +$ui-solarized-dark-noteDetail-backgroundColor = #002B36 + +$ui-solarized-dark-text-color = #DDDDDD +$ui-solarized-dark-active-color = #3A404C + +$ui-solarized-dark-borderColor = lighten(#21252B, 20%) + +$ui-solarized-dark-tag-backgroundColor = #3A404C + +$ui-solarized-dark-button--active-color = #f4f4f4 +$ui-solarized-dark-button--active-backgroundColor = #3A404C +$ui-solarized-dark-button--hover-backgroundColor = lighten($ui-dark-backgroundColor, 10%) +$ui-solarized-dark-button--focus-borderColor = lighten(#369DCD, 25%) \ No newline at end of file