diff --git a/browser/components/RealtimeNotification.styl b/browser/components/RealtimeNotification.styl index a79a4998..0f77acbb 100644 --- a/browser/components/RealtimeNotification.styl +++ b/browser/components/RealtimeNotification.styl @@ -29,3 +29,15 @@ body[data-theme="dark"] transition 0.2s &:hover color #5CB85C + + +body[data-theme="solarized-dark"] + .notification-area + background-color none + + .notification-link + color $ui-solarized-dark-text-color + border none + background-color $ui-solarized-dark-button-backgroundColor + &:hover + color #5CB85C diff --git a/browser/components/TodoListPercentage.styl b/browser/components/TodoListPercentage.styl index 7f44fd08..d4cb7485 100644 --- a/browser/components/TodoListPercentage.styl +++ b/browser/components/TodoListPercentage.styl @@ -38,4 +38,14 @@ body[data-theme="dark"] background-color: #1EC38B .percentageText - color $ui-dark-text-color \ No newline at end of file + color $ui-dark-text-color + +body[data-theme="solarized-dark"] + .percentageBar + background-color #002b36 + + .progressBar + background-color: #2aa198 + + .percentageText + color #fdf6e3 \ No newline at end of file diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl index bd1d409a..53e93574 100644 --- a/browser/components/markdown.styl +++ b/browser/components/markdown.styl @@ -334,7 +334,8 @@ body[data-theme="dark"] background-color themeDarkBorder color themeDarkText + body[data-theme="solarized-dark"] - color themeDarkText + color $ui-solarized-dark-text-color border-color themeDarkBorder background-color $ui-solarized-dark-noteDetail-backgroundColor \ No newline at end of file diff --git a/browser/main/Detail/Detail.styl b/browser/main/Detail/Detail.styl index 4d0e3fe8..4f4ebf12 100644 --- a/browser/main/Detail/Detail.styl +++ b/browser/main/Detail/Detail.styl @@ -22,3 +22,9 @@ body[data-theme="dark"] background-color $ui-dark-backgroundColor .empty-message color $ui-dark-inactive-text-color + +body[data-theme="solarized-dark"] + .root + background-color $ui-solarized-dark-noteDetail-backgroundColor + .empty-message + color $ui-solarized-dark-text-color diff --git a/browser/main/Detail/MarkdownNoteDetail.styl b/browser/main/Detail/MarkdownNoteDetail.styl index b7177303..5bd1e645 100644 --- a/browser/main/Detail/MarkdownNoteDetail.styl +++ b/browser/main/Detail/MarkdownNoteDetail.styl @@ -3,7 +3,7 @@ .root absolute top right bottom - border-left 1px solid alpha(#DEDEDE, 60%) + border-left 1px solid $ui-solarized-dark-borderColor background-color $ui-noteDetail-backgroundColor box-shadow none padding 20px 40px diff --git a/browser/main/Detail/NoteDetailInfo.styl b/browser/main/Detail/NoteDetailInfo.styl index 433c1f2f..85bf1a12 100644 --- a/browser/main/Detail/NoteDetailInfo.styl +++ b/browser/main/Detail/NoteDetailInfo.styl @@ -101,3 +101,4 @@ 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/TagSelect.styl b/browser/main/Detail/TagSelect.styl index 4001f03e..b9f52120 100644 --- a/browser/main/Detail/TagSelect.styl +++ b/browser/main/Detail/TagSelect.styl @@ -63,4 +63,20 @@ body[data-theme="dark"] .newTag border-color none background-color transparent - color $ui-dark-text-color \ No newline at end of file + color $ui-dark-text-color + +body[data-theme="solarized-dark"] + .tag + background-color $ui-solarized-dark-tag-backgroundColor + + .tag-removeButton + border-color $ui-button--focus-borderColor + background-color transparent + + .tag-label + color $ui-solarized-dark-text-color + + .newTag + border-color none + background-color transparent + 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 45e5ae94..474b1af3 100644 --- a/browser/main/SideNav/SideNav.styl +++ b/browser/main/SideNav/SideNav.styl @@ -166,4 +166,5 @@ body[data-theme="dark"] body[data-theme="solarized-dark"] .root, .root--folded - background-color $ui-dark-backgroundColor + background-color $ui-solarized-dark-backgroundColor + border-right 1px solid $ui-solarized-dark-borderColor diff --git a/browser/main/SideNav/StorageItem.styl b/browser/main/SideNav/StorageItem.styl index 6c06db37..619498ec 100644 --- a/browser/main/SideNav/StorageItem.styl +++ b/browser/main/SideNav/StorageItem.styl @@ -179,4 +179,8 @@ body[data-theme="dark"] background-color alpha($ui-dark-button--active-backgroundColor, 60%) &:active, &:active:hover color $ui-dark-text-color - background-color $ui-dark-button--active-backgroundColor \ No newline at end of file + background-color $ui-dark-button--active-backgroundColor + + + + diff --git a/browser/main/global.styl b/browser/main/global.styl index 66739fa8..27d1ae73 100644 --- a/browser/main/global.styl +++ b/browser/main/global.styl @@ -85,10 +85,14 @@ modalBackColor = white absolute top left bottom right background-color modalBackColor z-index modalZIndex + 1 + + body[data-theme="dark"] .ModalBase .modalBack background-color $ui-dark-backgroundColor + .sortableItemHelper + color: $ui-dark-text-color .CodeMirror font-family inherit !important @@ -108,6 +112,11 @@ body[data-theme="dark"] .sortableItemHelper z-index modalZIndex + 5 -body[data-theme="dark"] +body[data-theme="solarized-dark"] + .ModalBase + .modalBack + background-color $ui-solarized-dark-backgroundColor .sortableItemHelper - color: $ui-dark-text-color + color: $ui-solarized-dark-text-color + + diff --git a/browser/main/modals/PreferencesModal/ConfigTab.styl b/browser/main/modals/PreferencesModal/ConfigTab.styl index f9115c62..ae54218c 100644 --- a/browser/main/modals/PreferencesModal/ConfigTab.styl +++ b/browser/main/modals/PreferencesModal/ConfigTab.styl @@ -127,6 +127,12 @@ colorDarkControl() border-color $ui-dark-borderColor background-color $ui-dark-backgroundColor color $ui-dark-text-color + +colorSolarizedDarkControl() + border none + background-color $ui-solarized-dark-button-backgroundColor + color $ui-solarized-dark-text-color + body[data-theme="dark"] .root @@ -154,3 +160,33 @@ body[data-theme="dark"] .group-section-control select, .group-section-control-input colorDarkControl() + + +body[data-theme="solarized-dark"] + .root + color $ui-solarized-dark-text-color + + .group-header + color $ui-solarized-dark-text-color + border-color $ui-solarized-dark-borderColor + + .group-header2 + color $ui-solarized-dark-text-color + + .group-section-control-input + border-color $ui-solarized-dark-borderColor + + .group-control + border-color $ui-solarized-dark-borderColor + .group-control-leftButton + colorDarkDefaultButton() + border-color $ui-solarized-dark-borderColor + .group-control-rightButton + colorSolarizedDarkPrimaryButton() + .group-hint + colorSolarizedDarkControl() + .group-section-control + select, .group-section-control-input + colorSolarizedDarkControl() + + diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.styl b/browser/main/modals/PreferencesModal/Crowdfunding.styl index 527837a3..930c33f0 100644 --- a/browser/main/modals/PreferencesModal/Crowdfunding.styl +++ b/browser/main/modals/PreferencesModal/Crowdfunding.styl @@ -27,4 +27,10 @@ p body[data-theme="dark"] p - color $ui-dark-text-color \ No newline at end of file + color $ui-dark-text-color + +body[data-theme="solarized-dark"] + .root + color $ui-solarized-dark-text-color + p + color $ui-solarized-dark-text-color \ No newline at end of file diff --git a/browser/main/modals/PreferencesModal/FolderItem.styl b/browser/main/modals/PreferencesModal/FolderItem.styl index a54f464a..acc4cbfb 100644 --- a/browser/main/modals/PreferencesModal/FolderItem.styl +++ b/browser/main/modals/PreferencesModal/FolderItem.styl @@ -101,3 +101,28 @@ body[data-theme="dark"] .folderItem-right-dangerButton colorDarkDangerButton() + + + +body[data-theme="solarized-dark"] + .folderItem + &:hover + background-color $ui-solarized-dark-button-backgroundColor + + .folderItem-left-danger + color $danger-color + + .folderItem-left-key + color $ui-dark-inactive-text-color + + .folderItem-left-colorButton + colorSolarizedDarkPrimaryButton() + + .folderItem-right-button + colorSolarizedDarkPrimaryButton() + + .folderItem-right-confirmButton + colorSolarizedDarkPrimaryButton() + + .folderItem-right-dangerButton + colorSolarizedDarkPrimaryButton() diff --git a/browser/main/modals/PreferencesModal/InfoTab.styl b/browser/main/modals/PreferencesModal/InfoTab.styl index 4e632682..cc04a10f 100644 --- a/browser/main/modals/PreferencesModal/InfoTab.styl +++ b/browser/main/modals/PreferencesModal/InfoTab.styl @@ -60,3 +60,11 @@ body[data-theme="dark"] .root color alpha($tab--dark-text-color, 80%) + + +body[data-theme="solarized-dark"] + .root + color $ui-solarized-dark-text-color +.list + a + color $ui-solarized-dark-active-color diff --git a/browser/main/modals/PreferencesModal/PreferencesModal.styl b/browser/main/modals/PreferencesModal/PreferencesModal.styl index b0d89312..4a280a38 100644 --- a/browser/main/modals/PreferencesModal/PreferencesModal.styl +++ b/browser/main/modals/PreferencesModal/PreferencesModal.styl @@ -86,3 +86,29 @@ body[data-theme="dark"] background-color $dark-primary-button-background--active &:hover color white + + +body[data-theme="solarized-dark"] + .root + background-color transparent + .top-bar + background-color transparent + border-color $ui-solarized-dark-borderColor + p + color $ui-solarized-dark-text-color + .nav + background-color transparent + border-color $ui-solarized-dark-borderColor + .nav-button + background-color transparent + color $ui-solarized-dark-text-color + &:hover + color $ui-solarized-dark-text-color + + .nav-button--active + @extend .nav-button + color $ui-solarized-dark-button--active-color + background-color $ui-solarized-dark-button--active-backgroundColor + &:hover + color white + diff --git a/browser/main/modals/PreferencesModal/StoragesTab.styl b/browser/main/modals/PreferencesModal/StoragesTab.styl index 966a8eab..230f0aed 100644 --- a/browser/main/modals/PreferencesModal/StoragesTab.styl +++ b/browser/main/modals/PreferencesModal/StoragesTab.styl @@ -158,3 +158,44 @@ body[data-theme="dark"] .addStorage-body-control-cancelButton colorDarkDefaultButton() border-color $ui-dark-borderColor + + + +body[data-theme="solarized-dark"] + .root + color $ui-solarized-dark-text-color + + .folderList-item + border-bottom $ui-solarized-dark-borderColor + + .folderList-empty + color $ui-solarized-dark-text-color + + .list-empty + color $ui-solarized-dark-text-color + .list-control-addStorageButton + border-color $ui-solarized-dark-button-backgroundColor + background-color $ui-solarized-dark-button-backgroundColor + color $ui-solarized-dark-text-color + + .addStorage-header + color $ui-solarized-dark-text-color + border-color $ui-solarized-dark-borderColor + + .addStorage-body-section-name-input + border-color $$ui-solarized-dark-borderColor + + .addStorage-body-section-type-description + color $ui-solarized-dark-text-color + + .addStorage-body-section-path-button + colorPrimaryButton() + .addStorage-body-control + border-color $ui-solarized-dark-borderColor + + .addStorage-body-control-createButton + colorDarkPrimaryButton() + .addStorage-body-control-cancelButton + colorDarkDefaultButton() + border-color $ui-solarized-dark-borderColor + diff --git a/browser/styles/index.styl b/browser/styles/index.styl index 03f125b0..a7d31f8c 100644 --- a/browser/styles/index.styl +++ b/browser/styles/index.styl @@ -106,6 +106,18 @@ colorDarkPrimaryButton() &:active:hover background-color $dark-primary-button-background--active + +colorSolarizedDarkPrimaryButton() + color $ui-solarized-dark-text-color + background-color $ui-solarized-dark-button-backgroundColor + border none + &:hover + background-color $dark-primary-button-background--hover + &:active + &:active:hover + background-color $dark-primary-button-background--active + + // Danger button(Brand color) $danger-button-background = #c9302c $danger-button-background--hover = darken(#c9302c, 5%) @@ -223,7 +235,6 @@ $ui-button--focus-borderColor = lighten(#369DCD, 25%) /******* Dark theme ********/ $ui-dark-active-color = #3A404C - $ui-dark-borderColor = #444444 $ui-dark-backgroundColor = #2C3033 $ui-dark-noteList-backgroundColor = #2C3033 @@ -251,6 +262,7 @@ colorDarkDefaultButton() &:active:hover background-color $ui-dark-button--active-backgroundColor + $dark-danger-button-background = #c9302c $dark-danger-button-background--hover = darken(#c9302c, 5%) $dark-danger-button-background--active = darken(#c9302c, 10%) @@ -312,18 +324,19 @@ modalDark() /******* Solarized Dark theme ********/ -$ui-solarized-dark-backgroundColor = #2E3235 -$ui-solarized-dark-noteList-backgroundColor = #002B36 -$ui-solarized-dark-noteDetail-backgroundColor = #002B36 +$ui-solarized-dark-backgroundColor = #073642 +$ui-solarized-dark-noteList-backgroundColor = #073642 +$ui-solarized-dark-noteDetail-backgroundColor = #073642 -$ui-solarized-dark-text-color = #DDDDDD -$ui-solarized-dark-active-color = #3A404C +$ui-solarized-dark-text-color = #93a1a1 +$ui-solarized-dark-active-color = #2aa198 -$ui-solarized-dark-borderColor = lighten(#21252B, 20%) +$ui-solarized-dark-borderColor = #586e75 -$ui-solarized-dark-tag-backgroundColor = #3A404C +$ui-solarized-dark-tag-backgroundColor = #002b36 -$ui-solarized-dark-button--active-color = #f4f4f4 -$ui-solarized-dark-button--active-backgroundColor = #3A404C +$ui-solarized-dark-button-backgroundColor = #002b36 +$ui-solarized-dark-button--active-color = #93a1a1 +$ui-solarized-dark-button--active-backgroundColor = #073642 $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