Merge pull request #4347 from RocketChat/hotfix/rtl-day-divider-and-unread-bar-count

Hotfix rtl day divider and unread bar count
pull/4348/merge
Gabriel Engel 9 years ago committed by GitHub
commit 7521c7fb1d
  1. 14
      packages/rocketchat-theme/assets/stylesheets/rtl.less
  2. 8
      packages/rocketchat-ui/views/app/room.coffee

@ -514,18 +514,8 @@
}
.message {
padding: 18px 70px 4px 20px;
&.new-day {
margin-top: 60px;
&:before {
.right(0);
.calc(right,~"50% - 70px");
}
&:after {
.right(0);
.margin-right(2%);
}
}
padding-left: 20px;
padding-right: 70px;
.message-dropdown {
.right(-2px);
ul {

@ -619,10 +619,16 @@ Template.room.onRendered ->
template.sendToBottomIfNecessaryDebounced()
, 50
rtl = $('html').hasClass('rtl')
updateUnreadCount = _.throttle ->
messageBoxOffset = messageBox.offset()
lastInvisibleMessageOnScreen = document.elementFromPoint(messageBoxOffset.left+1, messageBoxOffset.top+1)
if rtl
lastInvisibleMessageOnScreen = document.elementFromPoint(messageBoxOffset.left+messageBox.width()-1, messageBoxOffset.top+1)
else
lastInvisibleMessageOnScreen = document.elementFromPoint(messageBoxOffset.left+1, messageBoxOffset.top+1)
if lastInvisibleMessageOnScreen?.id?
lastMessage = ChatMessage.findOne lastInvisibleMessageOnScreen.id
if lastMessage?

Loading…
Cancel
Save