1
0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-21 21:30:08 +00:00

Backport: Improve clearfix

This commit is contained in:
Maximilian Mader 2014-09-20 21:57:17 +02:00 committed by Tim Düsterhus
parent 73e8f053ee
commit fed02ce18b
2 changed files with 16 additions and 20 deletions

View File

@ -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) {

View File

@ -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>