4 Commits

Author	SHA1	Message	Date
Ayush Jain	341b763088	Desktop: Resolves #2883: Themes switched for more appealing text highlighting (#3192) ... * conflicts fixed and changes made to aceEditor.tsx * theme imported * theme imported	2020-05-18 11:30:29 +01:00
Laurent Cozic	6446a3c4de	Revert "Desktop: Resolves #2894: Set editor color scheme according to theme (#3188)" ... This reverts commit 488cb99d4c. Reason: The app doesn't even start https://github.com/laurent22/joplin/pull/3188#issuecomment-626334459	2020-05-10 16:33:28 +01:00
Ayush Jain	488cb99d4c	Desktop: Resolves #2894: Set editor color scheme according to theme (#3188) ... * conflicts fixed and changes made to aceEditor.tsx * theme imported	2020-05-10 15:13:55 +01:00
Tobias Johansson	62bddd7c69	Desktop: Moved all themes out into their own .js theme files (#2951) ... * 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!	2020-04-07 09:19:53 +01:00