6 Commits

Author	SHA1	Message	Date
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
Laurent Cozic	6b8e84332d	Desktop: Resolves #2639: Resource screen improvements (#2850) ... Co-authored-by: Georg Grab <talkdirty@users.noreply.github.com>	2020-04-08 11:12:25 +01:00
Tobias Johansson	2a8b27033f	Desktop: Added new Aritim-Dark theme (#2997) ... * 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	2020-04-07 10:23:40 +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
Laurent Cozic	3407a31cf6	Tools: Improve and simplify how to build the apps (#2538) ... * Improving CLI build * Improving CLI build * Remove requirement to build the tools * Moved Electron app one level down * Clean up Electron build * Moved tools to sub-dir * Updated root script * update root * update root * update root * update root * update root * update root * Updated build * Added doc * Update CI config * Should not lint index.js * Fixing jetify * Fixed linter errors * Fixed pod build * Fixed Windows build	2020-02-20 22:59:18 +00:00