diff --git a/converse.css b/converse.css
index 244d2f0ae..9f61b028e 100644
--- a/converse.css
+++ b/converse.css
@@ -386,16 +386,25 @@ span.spinner.hor_centered {
background-color: #2D617A;
}
-.chatroom .chat-body {
- height: -moz-calc(100% - 38px);
- height: -o-calc(100% - 38px);
- height: calc(100% - 38px);
+.chat-body {
background-color: white;
border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px;
border-top: 0;
}
+.chatbox .chat-body {
+ height: -moz-calc(100% - 38px);
+ height: -o-calc(100% - 38px);
+ height: calc(100% - 38px);
+}
+
+.chatroom .chat-body {
+ height: -moz-calc(100% - 38px);
+ height: -o-calc(100% - 38px);
+ height: calc(100% - 38px);
+}
+
.chatroom .chat-area {
float: left;
width: 200px;
@@ -450,16 +459,10 @@ ul.participant-list li.moderator {
-moz-box-sizing: border-box;
}
-.chatbox .chat-content {
- height: -moz-calc(100% - 114px);
- height: -o-calc(100% - 114px);
- height: calc(100% - 114px);
-}
-
-.chatroom .chat-content {
- height: -moz-calc(100% - 75px);
- height: -o-calc(100% - 75px);
- height: calc(100% - 75px);
+.chat-content {
+ height: -moz-calc(100% - 76px);
+ height: -o-calc(100% - 76px);
+ height: calc(100% - 76px);
}
.chat-info {
@@ -558,6 +561,10 @@ div.chat-title {
height: 1em;
}
+div.chat-title a {
+ color: white;
+}
+
.chat-head-chatbox,
.chat-head-chatroom {
background: linear-gradient(top, rgba(206,220,231,1) 0%,rgba(79,106,114,1) 100%);
@@ -576,6 +583,9 @@ p.chatroom-topic {
margin: 0;
}
+div.chat-head-chatbox a.user-custom-message {
+ color: white;
+}
.activated{
display: block !important;
}
diff --git a/converse.js b/converse.js
index c61faa18d..630ffec31 100644
--- a/converse.js
+++ b/converse.js
@@ -1149,19 +1149,21 @@
}
},
- swapToggleIcon: function ($el) {
- if ($el.hasClass('icon-minus')) {
- $el.removeClass('icon-minus').addClass('icon-plus');
- } else {
- $el.removeClass('icon-plus').addClass('icon-minus');
- }
- },
-
toggleChat: function (ev) {
+ // FIXME: Restore chat box to original resized height.
+ // Requires that we save the custom height.
+ this.$el.children('.box-flyout').attr('style', '');
+
this.saveToggleState();
- this.$el.find('form.sendXMPPMessage').toggle();
- this.$el.find('div.chat-content').slideToggle('fast');
- this.swapToggleIcon($(ev.target));
+ this.$el.find('div.chat-body').slideToggle('fast');
+ var $target = $(ev.target);
+ if ($target.hasClass('icon-minus')) {
+ $target.removeClass('icon-minus').addClass('icon-plus');
+ } else {
+ $target.removeClass('icon-plus').addClass('icon-minus');
+ }
+ // Toggle drag resize ability
+ this.$el.find('.dragresize-tm').toggle();
},
updateVCard: function () {
@@ -1746,12 +1748,6 @@
},
is_chatroom: true,
- toggleChat: function (ev) {
- this.saveToggleState();
- this.$el.find('div.chat-body').slideToggle('fast');
- this.swapToggleIcon($(ev.target));
- },
-
sendChatRoomMessage: function (body) {
var match = body.replace(/^\s*/, "").match(/^\/(.*?)(?: (.*))?$/) || [false],
$chat_content;
diff --git a/mockup.html b/mockup.html
index 5b4d1d6c9..a75404aba 100644
--- a/mockup.html
+++ b/mockup.html
@@ -1,5 +1,5 @@
-
+
Converse: Mockup
@@ -9,7 +9,7 @@
-
+