diff options
| author | Jaakko Keränen <jaakko.keranen@iki.fi> | 2020-09-19 07:55:16 +0300 |
|---|---|---|
| committer | Jaakko Keränen <jaakko.keranen@iki.fi> | 2020-09-19 07:55:16 +0300 |
| commit | 5e40fa752b462b2ce313fd63508a38e7120aa688 (patch) | |
| tree | e4f767b2b85e3223fc4406016b06d056ae1c2351 /src/ui/color.h | |
| parent | c936711f31038bd8c607047b5aa882ff40e7e7ae (diff) | |
| parent | fa5632e99e1ff723026fca053e4edc5aa8acbb3d (diff) | |
Merge branch 'dev' into release
# Conflicts:
# CMakeLists.txt
# res/about/help.gmi
# res/about/version.gmi
# src/app.c
# src/ui/documentwidget.c
Diffstat (limited to 'src/ui/color.h')
| -rw-r--r-- | src/ui/color.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/color.h b/src/ui/color.h index 2c481d13..51d3370f 100644 --- a/src/ui/color.h +++ b/src/ui/color.h | |||
| @@ -48,7 +48,7 @@ enum iColorId { | |||
| 48 | gray50_ColorId, | 48 | gray50_ColorId, |
| 49 | gray75_ColorId, | 49 | gray75_ColorId, |
| 50 | white_ColorId, | 50 | white_ColorId, |
| 51 | brown_ColorId, | 51 | brown_ColorId, |
| 52 | orange_ColorId, | 52 | orange_ColorId, |
| 53 | teal_ColorId, | 53 | teal_ColorId, |
| 54 | cyan_ColorId, | 54 | cyan_ColorId, |
| @@ -109,6 +109,7 @@ enum iColorId { | |||
| 109 | tmParagraph_ColorId, | 109 | tmParagraph_ColorId, |
| 110 | tmFirstParagraph_ColorId, | 110 | tmFirstParagraph_ColorId, |
| 111 | tmQuote_ColorId, | 111 | tmQuote_ColorId, |
| 112 | tmQuoteIcon_ColorId, | ||
| 112 | tmPreformatted_ColorId, | 113 | tmPreformatted_ColorId, |
| 113 | tmHeading1_ColorId, | 114 | tmHeading1_ColorId, |
| 114 | tmHeading2_ColorId, | 115 | tmHeading2_ColorId, |