From fed02ce18b94999b8cde5ae63bd04c051607dea4 Mon Sep 17 00:00:00 2001
From: Maximilian Mader <max@bastelstu.be>
Date: Sat, 20 Sep 2014 21:57:17 +0200
Subject: [PATCH] Backport: Improve clearfix

---
 file/style/be.bastelstu.chat.less | 20 ++++++++++++--------
 template/message.tpl              | 16 ++++------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/file/style/be.bastelstu.chat.less b/file/style/be.bastelstu.chat.less
index 4e3e219..6339aad 100644
--- a/file/style/be.bastelstu.chat.less
+++ b/file/style/be.bastelstu.chat.less
@@ -192,6 +192,16 @@
 							}
 						}
 						
+						&:not(.bubble) {
+							.timsChatInnerMessage {
+								div.timsChatTextContainer {
+									display: inline-block;
+									vertical-align: top;
+									max-width: 100%;
+								}
+							}
+						}
+						
 						&.bubble {
 							> .timsChatAvatarContainer {
 								margin-left: 0px;
@@ -208,6 +218,8 @@
 								
 								> .timsChatTextContainer {
 									> li.timsChatText {
+										.clearfix;
+										
 										border-style: solid;
 										border-width: 0 0 1px 0;
 										border-color:  @wcfContainerBorderColor;
@@ -271,14 +283,6 @@
 								}
 							}
 						}
-						
-						.timsChatInnerMessage {
-							> .timsChatTextContainer {
-								.timsChatText {
-									.clearfix;
-								}
-							}
-						}
 					}
 					
 					&:nth-child(even) {
diff --git a/template/message.tpl b/template/message.tpl
index 1f6b46e..394b8f7 100644
--- a/template/message.tpl
+++ b/template/message.tpl
@@ -47,22 +47,14 @@
 				</ul>
 				
 				<input type="checkbox" class="timsChatMessageGroupMarker jsTooltip" value="{@$message.messageID}" title="{lang}chat.global.markAll{/lang}" />
-			{elseif $message.type == $messageTypes.INFORMATION}
-				<div class="timsChatTextContainer">
-					<span class="timsChatText" data-message-id="{@$message.messageID}">
-						{@$message.formattedMessage}
-						
-						<input type="checkbox" class="timsChatMessageMarker jsTooltip" value="{@$message.messageID}" title="{lang}chat.global.mark{/lang}"/>
-					</span>
-				</div>
 			{else}
-				<span class="timsChatTextContainer">
-					<span class="timsChatText" data-message-id="{@$message.messageID}">
+				<div class="timsChatTextContainer">
+					<div class="timsChatText" data-message-id="{@$message.messageID}">
 						{@$message.formattedMessage}
 						
 						<input type="checkbox" class="timsChatMessageMarker jsTooltip" value="{@$message.messageID}" title="{lang}chat.global.mark{/lang}"/>
-					</span>
-				</span>
+					</div>
+				</div>
 			{/if}
 		</div>
 	</div>