diff --git a/css/converse.css b/css/converse.css index f0485f7de..f581425a4 100644 --- a/css/converse.css +++ b/css/converse.css @@ -5347,10 +5347,7 @@ background: #818479; } #converse-embedded-chat .chatbox .chat-body .chat-message .chat-msg-author, #conversejs .chatbox .chat-body .chat-message .chat-msg-author { - font-weight: bold; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; } + font-weight: bold; } #converse-embedded-chat .chatbox .chat-body .chat-message .chat-msg-them, #conversejs .chatbox .chat-body .chat-message .chat-msg-them { color: #3AA569; } @@ -6292,11 +6289,8 @@ height: 100vh; } } #converse-embedded-chat .chatroom .box-flyout .chatroom-body, #conversejs .chatroom .box-flyout .chatroom-body { - height: 289px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; - height: -webkit-calc(100% - 55px); - height: calc(100% - 55px); background-color: white; border-top: 0; width: 100%; @@ -6330,8 +6324,7 @@ #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chat-area, #conversejs .chatroom .box-flyout .chatroom-body .chat-area { word-wrap: break-word; - min-width: 200px; - height: calc(100% - 95px); } + min-width: 200px; } #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chat-area .new-msgs-indicator, #conversejs .chatroom .box-flyout .chatroom-body .chat-area .new-msgs-indicator { background-color: #E77051; @@ -6480,9 +6473,6 @@ width: 100%; border: 1px solid #999; } -@media screen and (max-width: 767px) { - #conversejs .chatbox .box-flyout .chatroom-body .chat-area { - height: calc(100vh - 55px); } } #conversejs .chatbox.headlines .chat-head.chat-head-chatbox { background-color: #E7A151; } #conversejs .chatbox.headlines .chat-body { diff --git a/css/inverse.css b/css/inverse.css index 25a9fba64..6c6d95bc3 100644 --- a/css/inverse.css +++ b/css/inverse.css @@ -5403,10 +5403,7 @@ body { background: #818479; } #converse-embedded-chat .chatbox .chat-body .chat-message .chat-msg-author, #conversejs .chatbox .chat-body .chat-message .chat-msg-author { - font-weight: bold; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; } + font-weight: bold; } #converse-embedded-chat .chatbox .chat-body .chat-message .chat-msg-them, #conversejs .chatbox .chat-body .chat-message .chat-msg-them { color: #3AA569; } @@ -6422,11 +6419,8 @@ body { height: 100vh; } } #converse-embedded-chat .chatroom .box-flyout .chatroom-body, #conversejs .chatroom .box-flyout .chatroom-body { - height: 289px; border-bottom-right-radius: 0; border-bottom-left-radius: 0; - height: -webkit-calc(100% - 62px); - height: calc(100% - 62px); background-color: white; border-top: 0; width: 100%; @@ -6460,8 +6454,7 @@ body { #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chat-area, #conversejs .chatroom .box-flyout .chatroom-body .chat-area { word-wrap: break-word; - min-width: 100%; - height: calc(100% - 95px); } + min-width: 100%; } #converse-embedded-chat .chatroom .box-flyout .chatroom-body .chat-area .new-msgs-indicator, #conversejs .chatroom .box-flyout .chatroom-body .chat-area .new-msgs-indicator { background-color: #E77051; @@ -6610,9 +6603,6 @@ body { width: 100%; border: 1px solid #999; } -@media screen and (max-width: 767px) { - #conversejs .chatbox .box-flyout .chatroom-body .chat-area { - height: calc(100vh - 55px); } } #conversejs.fullscreen .chat-head-chatroom { height: 62px; font-size: 20px; } diff --git a/mockup/chatroom.html b/mockup/chatroom.html index 586ccb084..6b0840afd 100644 --- a/mockup/chatroom.html +++ b/mockup/chatroom.html @@ -100,7 +100,6 @@
  • jabber the hut
    • -

    Features

    - 19:25  - - Benedict-John:  + + 19:25  Benedict-John: Dagsê
    @@ -122,86 +121,83 @@ -
    -
    -
    -
    -
    - 18:50  - - luke:  - - leia: hi :) -
    -
    - 19:40  - - leia:  - - I'll be gone for a while, will be back in about an hour -
    - -
    - 19:40  - - Obi-wan Kenobi, Jedi Master:  - - I'll be gone for a while, will be back in about an hour -
    -
    - 19:42  - - me:  - - Supercalifragilisticexpialidociousstillnotlongenough -
    -
    - 19:43  - - Obi-wan Kenobi, Jedi Master:  - - Another message to check that scrolling works. -
    +
    +
    +
    +
    + 18:50  + + luke:  + + leia: hi :) +
    +
    + 19:40  + + leia:  + + I'll be gone for a while, will be back in about an hour +
    + +
    + 19:40  + + Obi-wan Kenobi, Jedi Master:  + + I'll be gone for a while, will be back in about an hour +
    +
    + 19:42  + + me:  + + Supercalifragilisticexpialidociousstillnotlongenough +
    +
    + 19:43  + + Obi-wan Kenobi, Jedi Master:  + + Another message to check that scrolling works.
    -
    -
      -
    • -
      • -
      • -
    - -
    - -
    -

    Occupants:

    -
    - - -
    - -
      -
    • -
      luke
      • -
    • -
      leia
      • -
    • -
      Obi-wan Kenobi, Jedi Master
      • -
    • -
      jabber the hut
      • +
      +
        +
      • +
        • +
      + +
      +
    -
    -

    Features

    -
      -
    •  
      • -
    •  
      • -
    •  
      • -
    •  
      • -
    •  
      • -
    •  
      • -
    -
    +
    +

    Occupants:

    +
    + + +
    + +
      +
    • +
      luke
      • +
    • +
      leia
      • +
    • +
      Obi-wan Kenobi, Jedi Master
      • +
    • +
      jabber the hut
      • +
    +
    +

    Features

    +
      +
    •  
      • +
    •  
      • +
    •  
      • +
    •  
      • +
    •  
      • +
    •  
      • +
    diff --git a/sass/_chatbox.scss b/sass/_chatbox.scss index b94bcc042..df75e6573 100644 --- a/sass/_chatbox.scss +++ b/sass/_chatbox.scss @@ -171,9 +171,6 @@ .chat-msg-author { font-weight: bold; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; } .chat-msg-them { color: $message-them-color; diff --git a/sass/_chatrooms.scss b/sass/_chatrooms.scss index fcc2bd107..4fcd57d30 100644 --- a/sass/_chatrooms.scss +++ b/sass/_chatrooms.scss @@ -61,9 +61,7 @@ height: 100vh; } .chatroom-body { - height: 289px; @include border-bottom-radius($chatbox-border-radius); - @include calc(height, '100% - #{$chat-head-height}'); background-color: white; border-top: 0; width: 100%; @@ -103,8 +101,6 @@ .chat-area { word-wrap: break-word; min-width: $chat-width; - height: calc(100% - 95px); - .new-msgs-indicator { background-color: $chatroom-head-color; max-width: 70%; @@ -272,7 +268,6 @@ .box-flyout { .chatroom-body { .chat-area { - height: calc(100vh - 55px); } } }