From e7debe0188b95e8b75215178cdb8f5ea43fd78e6 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sun, 26 May 2013 19:02:30 +0200 Subject: [PATCH] Fixed room join form styling. - list of rooms dropped off the controlbox --- converse.css | 26 ++++++++++++++------------ converse.js | 2 -- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/converse.css b/converse.css index b10577216..401b643fc 100644 --- a/converse.css +++ b/converse.css @@ -498,11 +498,6 @@ a.configure-chatroom-button { margin-top: 0.5em; } -#available-chatrooms { - height: 183px; - overflow-y: auto; -} - #available-chatrooms dd { overflow-x: hidden; text-overflow: ellipsis; @@ -517,7 +512,7 @@ a.configure-chatroom-button { font-size: 13px; color: #666; border: none; - padding: 0.3em 0.5em 0.3em 0.5em; + padding: 0em 0em 0.3em 0.5em; text-shadow: 0 1px 0 rgba(250, 250, 250, 1); } @@ -530,7 +525,7 @@ dd.available-chatroom, font-weight: bold; border: none; display: block; - padding: 0 0.5em 0 0.5em; + padding: 0 0em 0 0.5em; color: #666; text-shadow: 0 1px 0 rgba(250, 250, 250, 1); } @@ -546,6 +541,10 @@ li.room-info { margin-left: 5px; } +div.room-info { + clear: left; +} + p.room-info { margin: 0; padding: 0; @@ -556,13 +555,13 @@ p.room-info { a.room-info { background: url('images/information.png') no-repeat right top; width: 22px; - height: 22px; float: right; display: none; + clear: right; } a.open-room { - display: inline-block; + float: left; white-space: nowrap; text-overflow: ellipsis; overflow-x: hidden; @@ -667,13 +666,12 @@ form.set-xmpp-status { form.add-chatroom { background: none; - padding: 0.5em; + padding: 3px; } form.add-chatroom input[type=text] { - width: 172px; + width: 95%; margin: 3px; - padding: 1px; } form.add-chatroom input[type=button], @@ -748,6 +746,10 @@ div#settings { border-bottom-left-radius: 4px; } +div#chatrooms { + overflow-y: auto; +} + form.sendXMPPMessage { background: white; border: 1px solid #999; diff --git a/converse.js b/converse.js index 9e52cd54a..66e4e15d3 100644 --- a/converse.js +++ b/converse.js @@ -751,11 +751,9 @@ template: _.template( '
'+ - ''+ ''+ ''+ ''+ - ''+ ''+ ''+ '
'+