self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Desktop: Added new Aritim-Dark theme (#2997)

Browse Source 
* Working on an aritim-dark theme, very WIP still

* Update aritim.js

* Added new theme "Aritim-Dark"

* removing aritim-dark "brace" theme for now

* Updating style with some changes

* Reset branch back to the original upstream state, to create a different pull-request for moving all themes outside

* Reset branch back to the original upstream state

* Moved all themes out into their own .js theme files

* Updating master to use the seperated themes stuff

* Moved themes into their own const

* Removed switch case for themes and simplified it. Thanks Laurent for the help!

* Adding Aritim-Dark to theme options
This commit is contained in:
Tobias Johansson 2020-04-07 11:23:40 +02:00 committed by GitHub
parent 62bddd7c69
commit 2a8b27033f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ElectronClient/gui/style/theme/aritimDark.js Normal file
View File

@ -0,0 +1,41 @@
const aritimStyle = {
backgroundColor: '#10151a', // Main background color
backgroundColorTransparent: 'rgba(16, 21, 26, 0.9)', //
oddBackgroundColor: '#141a21',
color: '#d3dae3', // For regular text (everything except notebooks)
colorError: '#9a2f2f',
colorWarn: '#d66500',
colorFaded: '#666a73', // For less important text (e.g. not selected menu in settings)
colorBright: '#005b47', // For important text; (e.g. bold)
dividerColor: '#141a21', // Borders, I wish I could remove them
selectedColor: '#2b5278', // Selected note
urlColor: '#356693', // Links to external sites (e.g. in settings)
backgroundColor2: '#141a21', // Notebooks main background
depthColor: '#141a21', // Notebooks background color
color2: '#d3dae3', // Notebook sidebar text color
selectedColor2: '#10151a', // Selected notebook (or settings icon in settings)
colorError2: '#9a2f2f',
raisedBackgroundColor: '#2b5278', // Table, hover
raisedColor: '#141a21',
warningBackgroundColor: '#9a2f2f', // Info / Warning boxes bg color
// Markdown rendered
htmlColor: '#d3dae3', // Text color
htmlBackgroundColor: '#10151a', // BG Color
htmlDividerColor: '#d3dae3', // Lines e.g. ---
htmlLinkColor: '#356693', // Normal links
htmlTableBackgroundColor: '#141a21', // Table (even) background color
htmlCodeBackgroundColor: '#141a21', // Single line code bg
htmlCodeBorderColor: '#141a21', // Single line code border, and tables
htmlCodeColor: '#005b47', // Single line code text
editorTheme: 'chaos',
codeThemeCss: 'atom-one-dark-reasonable.css',
highlightedColor: '#d3dae3',
};
module.exports = aritimStyle;

1
ElectronClient/theme.js
View File

@ -7,6 +7,7 @@ const themes = {
[Setting.THEME_SOLARIZED_LIGHT]: require('./gui/style/theme/solarizedLight'),
[Setting.THEME_SOLARIZED_DARK]: require('./gui/style/theme/solarizedDark'),
[Setting.THEME_NORD]: require('./gui/style/theme/nord'),
[Setting.THEME_ARITIM_DARK]: require('./gui/style/theme/aritimDark'),
};
// globalStyle should be used for properties that do not change across themes

2
ReactNativeClient/lib/models/Setting.js
View File

@ -247,6 +247,7 @@ class Setting extends BaseModel {
output[Setting.THEME_SOLARIZED_LIGHT] = _('Solarised Light');
output[Setting.THEME_SOLARIZED_DARK] = _('Solarised Dark');
output[Setting.THEME_NORD] = _('Nord');
output[Setting.THEME_ARITIM_DARK] = _('Aritim Dark');
} else {
output[Setting.THEME_OLED_DARK] = _('OLED Dark');
}
@ -1053,6 +1054,7 @@ Setting.THEME_SOLARIZED_LIGHT = 3;
Setting.THEME_SOLARIZED_DARK = 4;
Setting.THEME_DRACULA = 5;
Setting.THEME_NORD = 6;
Setting.THEME_ARITIM_DARK = 7;
Setting.FONT_DEFAULT = 0;
Setting.FONT_MENLO = 1;