Merge master and fix conflicts
This commit is contained in:
commit
3f567a8da7
87 changed files with 5667 additions and 2989 deletions
|
|
@ -540,7 +540,7 @@ utils::markdownToHtml(const QString &text, bool rainbowify)
|
|||
// Use colors as described here:
|
||||
// https://shark.comfsm.fm/~dleeling/cis/hsl_rainbow.html
|
||||
auto color =
|
||||
QColor::fromHslF((charIdx - 1.0) / textLen * (5. / 6.), 1.0, 0.5);
|
||||
QColor::fromHslF((charIdx - 1.0) / textLen * (5. / 6.), 0.9, 0.5);
|
||||
// format color for HTML
|
||||
auto colorString = color.name(QColor::NameFormat::HexRgb);
|
||||
// create HTML element for current char
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue