diff --git a/TODO.md b/TODO.md index 2d5a9700..8bb84529 100644 --- a/TODO.md +++ b/TODO.md @@ -13,7 +13,7 @@ - Fixes - Icons on KDE - - Show error if uploading avatar fails + - Show error if uploading avatar fails or file is corrupted - If account not in config anymore, discard ui state last page on startup - Don't strip user spacing in html diff --git a/src/python/html_filter.py b/src/python/html_filter.py index 1c48410f..748ec87c 100644 --- a/src/python/html_filter.py +++ b/src/python/html_filter.py @@ -56,7 +56,7 @@ class HtmlFilter: return text return re.sub( - r"(^\s*>.*)", r'\1', text, + r"(^\s*>.*)", r'\1', text, ) @@ -84,7 +84,7 @@ class HtmlFilter: return re.sub( r"<(p|br/?)>(\s*>.*)(!?)", - r'<\1>\2\3', + r'<\1>\2\3', text, ) diff --git a/src/qml/SidePane/RoomDelegate.qml b/src/qml/SidePane/RoomDelegate.qml index 5f5ddf9b..0b905fcb 100644 --- a/src/qml/SidePane/RoomDelegate.qml +++ b/src/qml/SidePane/RoomDelegate.qml @@ -80,8 +80,8 @@ HTileDelegate { ) + ": " + ev.inline_content return text.replace( - /< *span +class=['"]?greentext['"]? *>(.+)<\/ *span *>/, - '$1', + /< *span +class=['"]?quote['"]? *>(.+)<\/ *span *>/, + '$1', ) } diff --git a/src/themes/Default.qpl b/src/themes/Default.qpl index f4260b97..0286cf0f 100644 --- a/src/themes/Default.qpl +++ b/src/themes/Default.qpl @@ -278,9 +278,9 @@ chat: color body: colors.text color date: colors.dimText - color greenText: hsluv(135, colors.saturation * 2.25, 75) - color link: colors.link - color code: colors.code + color quote: hsluv(135, colors.saturation * 2.25, 75) + color link: colors.link + color code: colors.code string styleSheet: "a { color: " + link + " }" + @@ -296,7 +296,7 @@ chat: "h5 { font-size: " + fontSize.small + "px }" + "h6 { font-size: " + fontSize.smaller + "px }" + - ".greentext { color: " + greenText + " }" + ".quote { color: " + quote + " }" string styleInclude: '\n'