Merge pull request #869 from jrnl-org/develop

Merge develop into master for v2.3 beta
This commit is contained in:
Jonathan Wren 2020-03-07 14:50:54 -08:00 committed by GitHub
commit b3793fbb7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 1258 additions and 319 deletions

View file

@ -35,8 +35,9 @@ and can be edited with a plain text editor.
- `highlight`
if `true`, tags will be highlighted in cyan.
- `linewrap`
controls the width of the output. Set to `false` if you don't
want to wrap long lines.
controls the width of the output. Set to `false` if you don't want to wrap long lines.
- `colors`
dictionary that controls the colors used to display journal entries. It has two subkeys, which are: `date` and `title`. Current valid values are: `BLACK`, `RED`, `GREEN`, `YELLOW`, `BLUE`, `MAGENTA`, `CYAN`, and `WHITE`. `colorama.Fore` is used for colorization, and you can find the [docs here](https://github.com/tartley/colorama#colored-output). To disable colored output, set the value to `NONE`. If you set the value of any color subkey to an invalid color, no color will be used.
!!! note
Although it seems intuitive to use the `#`