Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-06 15:10:12 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-06 15:10:12 (GMT) |
| commit | af60327f18a1b9a12330a14623c7c38958d12146 (patch) | |
| tree | 96582f8948d03190479190888cee9a084c3eb418 /Swift | |
| parent | d881c4ff390a21c499fd6bc685738cf4e3fabfbd (diff) | |
| download | swift-af60327f18a1b9a12330a14623c7c38958d12146.zip swift-af60327f18a1b9a12330a14623c7c38958d12146.tar.bz2 | |
Move ack indicator position and reduce height of followup messages
This patch moves the message receipt/ack indicator into the
colored swatch right of the avatar. This allows followup
messages to be reduced in their height so they consume less
space.
Test-Information:
Tested 1-to-1 and MUC chats that the patch works as expected.
Change-Id: I8bb3ccdc36338b1c1f4361b323ca09ffac30336a
Diffstat (limited to 'Swift')
5 files changed, 33 insertions, 18 deletions
diff --git a/Swift/resources/themes/Default/Incoming/Content.html b/Swift/resources/themes/Default/Incoming/Content.html index 05c9796..4f54cc4 100644 --- a/Swift/resources/themes/Default/Incoming/Content.html +++ b/Swift/resources/themes/Default/Incoming/Content.html @@ -3,13 +3,14 @@ <div class="user"> <div class="time"> <p>%time%</p> - <span class="swift_ack"></span> - <span class="swift_receipt"></span> </div> <div class="otheravatar"> <img src="%userIconPath%"/> </div> - <div class="otherright"></div> + <div class="otherright"> + <span class="swift_ack"></span> + <span class="swift_receipt"></span> + </div> </div> <div class="text"> <p class="otherusername">%wrapped_sender%</p> diff --git a/Swift/resources/themes/Default/Incoming/NextContent.html b/Swift/resources/themes/Default/Incoming/NextContent.html index af5ec2b..dedc56f 100644 --- a/Swift/resources/themes/Default/Incoming/NextContent.html +++ b/Swift/resources/themes/Default/Incoming/NextContent.html @@ -3,13 +3,14 @@ <div class="user"> <div class="time-additional"> <p>%time%</p> - <span class="swift_ack"></span> - <span class="swift_receipt"></span> </div> <div class="systemavatar"> <img/> </div> - <div class="systemright"></div> + <div class="systemright"> + <span class="swift_ack"></span> + <span class="swift_receipt"></span> + </div> </div> <div class="text"> <div class="message-content">%message%</div> diff --git a/Swift/resources/themes/Default/Outgoing/Content.html b/Swift/resources/themes/Default/Outgoing/Content.html index 7100748..439b5c2 100644 --- a/Swift/resources/themes/Default/Outgoing/Content.html +++ b/Swift/resources/themes/Default/Outgoing/Content.html @@ -3,13 +3,14 @@ <div class="user"> <div class="time"> <p>%time%</p> - <span class="swift_ack"></span> - <span class="swift_receipt"></span> </div> <div class="myavatar"> <img src="%userIconPath%"/> </div> - <div class="myright"></div> + <div class="myright"> + <span class="swift_ack"></span> + <span class="swift_receipt"></span> + </div> </div> <div class="text"> <p class="myusername">%wrapped_sender%</p> diff --git a/Swift/resources/themes/Default/Outgoing/NextContent.html b/Swift/resources/themes/Default/Outgoing/NextContent.html index 8795298..4fc703f 100644 --- a/Swift/resources/themes/Default/Outgoing/NextContent.html +++ b/Swift/resources/themes/Default/Outgoing/NextContent.html @@ -3,13 +3,14 @@ <div class="user"> <div class="time-additional"> <p>%time%</p> - <span class="swift_ack"></span> - <span class="swift_receipt"></span> </div> <div class="systemavatar"> <img/> </div> - <div class="systemright"></div> + <div class="systemright"> + <span class="swift_ack"></span> + <span class="swift_receipt"></span> + </div> </div> <div class="text"> <div class="message-content">%message%</div> diff --git a/Swift/resources/themes/Default/main.css b/Swift/resources/themes/Default/main.css index 97888c5..83b1561 100644 --- a/Swift/resources/themes/Default/main.css +++ b/Swift/resources/themes/Default/main.css @@ -73,8 +73,11 @@ body { /* Left column content */ -.user { +:not(.additional) > .user { height: 32px; +} + +.user { width: 175px; text-align: center; float: left; @@ -98,7 +101,6 @@ body { } .time-additional { - height: 32px; width: 103px; float: left; text-align: right; @@ -168,8 +170,11 @@ body { background: #6eb6ce; } -.systemavatar { +:not(.additional) > div > .systemavatar { height: 32px; +} + +.systemavatar { width: 32px; display: inline-block; margin:0 auto; @@ -178,17 +183,23 @@ body { border-bottom-left-radius: 50%; } +:not(.additional) > div > .systemright { + height: 32px; +} + .systemright { float:right; - width:40px; - height: 32px; + width: 40px; background: #595959; } /* Right column content */ -.text { +.message:not(.additional) .text { min-height: 32px; +} + +.text { margin-left: 175px; font-size: 14px; color: #595959; |