summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-10-21 20:38:51 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-10-24 08:08:27 (GMT)
commit2a58e24ba8d0a75da353a55583cf16bf32df3c7a (patch)
tree618314f154c308c2c1de95cf445ade3e1be5bd2b /Swift/resources/themes/Default/Incoming
parentb26ad89bddfc171050c3148e3b122599f3b3464b (diff)
downloadswift-2a58e24ba8d0a75da353a55583cf16bf32df3c7a.zip
swift-2a58e24ba8d0a75da353a55583cf16bf32df3c7a.tar.bz2
Reduce width of sidebar in chat theme; move time inline
The moves the timestamps from the sidebar into the message block to the right, after the nickname, floating right-aligned at the top of a message. This reduces the width of the sidebar. Test-Information: Tested with Qt 5.7.0 and QtWebKit TP4 on macOS 10.12. Tested MUC and 1-to-1 chat views. Tested last message correction UI behaviour. Change-Id: Ibd899e9017ac5654b3eb3fe909c9be1524d4b50b
Diffstat (limited to 'Swift/resources/themes/Default/Incoming')
-rw-r--r--Swift/resources/themes/Default/Incoming/Content.html6
-rw-r--r--Swift/resources/themes/Default/Incoming/NextContent.html6
2 files changed, 6 insertions, 6 deletions
diff --git a/Swift/resources/themes/Default/Incoming/Content.html b/Swift/resources/themes/Default/Incoming/Content.html
index b6e9ec5..15bc088 100644
--- a/Swift/resources/themes/Default/Incoming/Content.html
+++ b/Swift/resources/themes/Default/Incoming/Content.html
@@ -1,9 +1,6 @@
<!--OTHERS MESSAGE-->
<div class="message" id="%id%">
<div class="user">
- <div class="time">
- <p>%time%</p>
- </div>
<div class="otheravatar">
<img src="%userIconPath%"/>
</div>
@@ -14,6 +11,9 @@
</div>
<div class="text">
<p class="otherusername username">%wrapped_sender%</p>
+ <div class="time">
+ %time%
+ </div>
<div class="message-content">%message%</div>
</div>
</div>
diff --git a/Swift/resources/themes/Default/Incoming/NextContent.html b/Swift/resources/themes/Default/Incoming/NextContent.html
index dedc56f..36fdaa3 100644
--- a/Swift/resources/themes/Default/Incoming/NextContent.html
+++ b/Swift/resources/themes/Default/Incoming/NextContent.html
@@ -1,9 +1,6 @@
<!--OTHERS MESSAGE ADDITIONAL-->
<div class="message additional" id="%id%">
<div class="user">
- <div class="time-additional">
- <p>%time%</p>
- </div>
<div class="systemavatar">
<img/>
</div>
@@ -13,6 +10,9 @@
</div>
</div>
<div class="text">
+ <div class="time">
+ %time%
+ </div>
<div class="message-content">%message%</div>
</div>
</div>