Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Solarized Dark theme #1293

Merged
merged 3 commits into from
Dec 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion browser/components/NoteItem.styl
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ body[data-theme="solarized-dark"]

.item--active
border-color $ui-solarized-dark-borderColor
background-color $ui-solarized-dark-button--active-backgroundColor
background-color $ui-solarized-dark-button-backgroundColor
.item-wrapper
border-color transparent
.item-title
Expand Down
12 changes: 12 additions & 0 deletions browser/components/RealtimeNotification.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 11 additions & 1 deletion browser/components/TodoListPercentage.styl
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,14 @@ body[data-theme="dark"]
background-color: #1EC38B

.percentageText
color $ui-dark-text-color
color $ui-dark-text-color

body[data-theme="solarized-dark"]
.percentageBar
background-color #002b36

.progressBar
background-color: #2aa198

.percentageText
color #fdf6e3
3 changes: 2 additions & 1 deletion browser/components/markdown.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
38 changes: 38 additions & 0 deletions browser/finder/FinderMain.styl
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,41 @@ body[data-theme="dark"]
absolute top bottom right
left $nav-width + $list-width
background-color $ui-dark-noteDetail-backgroundColor



body[data-theme="solarized-dark"]
.root
background-color $ui-solarized-dark-backgroundColor
.search
border-color $ui-solarized-dark-borderColor
.search-input
color $ui-dark-text-color

.result
background-color $ui-solarized-dark-backgroundColor

.result-nav
background-color $ui-solarized-dark-backgroundColor
label
color $ui-dark-text-color

.result-nav-menu
navDarkButtonColor()

.result-nav-menu--active
background-color $ui-solarized-dark-button-backgroundColor
color $ui-dark-button--active-color
&:hover
background-color $ui-dark-button--active-backgroundColor

.result-list
border-color $ui-solarized-dark-borderColor
box-shadow none
top 0

.result-detail
absolute top bottom right
left $nav-width + $list-width
background-color $ui-solarized-dark-backgroundColor

32 changes: 32 additions & 0 deletions browser/finder/NoteDetail.styl
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,35 @@ body[data-theme="dark"]
&:hover
color white
background-color $ui-dark-button--hover-backgroundColor


body[data-theme="solarized-dark"]
.root
background-color $ui-solarized-dark-backgroundColor

.description
border-color $ui-dark-borderColor
background-color $ui-solarized-dark-backgroundColor

.description-textarea
background-color $ui-solarized-dark-backgroundColor
color white

.tabList
background-color $ui-solarized-dark-backgroundColor

.tabList-item
border-color $ui-dark-borderColor
&:hover
background-color $ui-dark-button--hover-backgroundColor

.tabList-item-button
border none
color $ui-dark-text-color
background-color transparent
transition color background-color 0.15s
border-left 4px solid transparent
&:hover
color white
background-color $ui-dark-button--hover-backgroundColor

6 changes: 6 additions & 0 deletions browser/main/Detail/Detail.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion browser/main/Detail/MarkdownNoteDetail.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions browser/main/Detail/NoteDetailInfo.styl
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,4 @@ body[data-theme="solarized-dark"]
.info
border-color $ui-solarized-dark-borderColor
background-color $ui-solarized-dark-noteDetail-backgroundColor

18 changes: 17 additions & 1 deletion browser/main/Detail/TagSelect.styl
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,20 @@ body[data-theme="dark"]
.newTag
border-color none
background-color transparent
color $ui-dark-text-color
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
3 changes: 2 additions & 1 deletion browser/main/SideNav/SideNav.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 5 additions & 1 deletion browser/main/SideNav/StorageItem.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
background-color $ui-dark-button--active-backgroundColor




13 changes: 11 additions & 2 deletions browser/main/global.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


36 changes: 36 additions & 0 deletions browser/main/modals/PreferencesModal/ConfigTab.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()


8 changes: 7 additions & 1 deletion browser/main/modals/PreferencesModal/Crowdfunding.styl
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,10 @@ p

body[data-theme="dark"]
p
color $ui-dark-text-color
color $ui-dark-text-color

body[data-theme="solarized-dark"]
.root
color $ui-solarized-dark-text-color
p
color $ui-solarized-dark-text-color
25 changes: 25 additions & 0 deletions browser/main/modals/PreferencesModal/FolderItem.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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()
8 changes: 8 additions & 0 deletions browser/main/modals/PreferencesModal/InfoTab.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 26 additions & 0 deletions browser/main/modals/PreferencesModal/PreferencesModal.styl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Loading