StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2994

Browse Source 
Chiitoo (1):
      Chatlog: Adjust whitespace behaviour/handling.
This commit is contained in:
sudden6 2016-03-26 10:56:27 +01:00
commit 0f0113e72f
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chatlog/chatmessage.cpp
View File

@ -306,5 +306,5 @@ QString ChatMessage::detectQuotes(const QString& str, MessageType type)
QString ChatMessage::wrapDiv(const QString &str, const QString &div)
{
return QString("<div class=%1>%2</div>").arg(div, str);
return QString("<p class=%1>%2</p>").arg(div, /*QChar(0x200E) + */QString(str));
}

14
ui/chatArea/innerStyle.css
View File

@ -1,14 +1,18 @@
div.msg {
p {
white-space: pre-wrap;
}
p.msg {
color: @black;
font: @big;
}
div.action {
p.action {
color: #1818FF;
font: @big;
}
div.typing {
p.typing {
color: @mediumGreyLight;
font: @big;
}
@ -17,7 +21,7 @@ span.quote {
color: #279419;
}
div.alert {
p.alert {
margin-left: 0px;
margin-right: 0px;
color: @black;
@ -25,7 +29,7 @@ div.alert {
font: @big;
}
div.alert_name {
p.alert_name {
color: @black;
background-color: @orange;
font: @bigBold;