From f0204dd54b9e7f390e2387e3083fb3971dd0ee5c Mon Sep 17 00:00:00 2001 From: JC Brand Date: Sat, 31 Aug 2013 14:29:58 +0200 Subject: [PATCH] Use class instead of id for controlbox-panes element --- converse.css | 3 +-- converse.js | 8 ++++---- mockup.html | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/converse.css b/converse.css index dd0e1461b..12e822818 100644 --- a/converse.css +++ b/converse.css @@ -216,7 +216,6 @@ li.chat-info { padding-top: 10px; } -div#settings, div#chatrooms, div#login-dialog { height: 274px; @@ -609,7 +608,7 @@ dd.available-chatroom:hover a.room-info { background-color: #DCEAC5; } -div#controlbox-panes { +.controlbox-panes { background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(240,240,240,1) 100%); /* FF3.6+ */ background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* IE10+ */ background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* Opera 11.10+ */ diff --git a/converse.js b/converse.js index 99441fbbf..e5e1c728b 100644 --- a/converse.js +++ b/converse.js @@ -1318,7 +1318,7 @@ ''+ ''+ ''+ - '
' + '
' ), switchTab: function (ev) { @@ -1345,15 +1345,15 @@ if ((!converse.prebind) && (!converse.connection)) { // Add login panel if the user still has to authenticate this.$el.html(this.template(this.model.toJSON())); - this.loginpanel = new converse.LoginPanel({'$parent': this.$el.find('#controlbox-panes'), 'model': this}); + this.loginpanel = new converse.LoginPanel({'$parent': this.$el.find('.controlbox-panes'), 'model': this}); this.loginpanel.render(); } else if (!this.contactspanel) { this.$el.html(this.template(this.model.toJSON())); - this.contactspanel = new converse.ContactsPanel({'$parent': this.$el.find('#controlbox-panes')}); + this.contactspanel = new converse.ContactsPanel({'$parent': this.$el.find('.controlbox-panes')}); this.contactspanel.render(); converse.xmppstatusview = new converse.XMPPStatusView({'model': converse.xmppstatus}); converse.xmppstatusview.render(); - this.roomspanel = new converse.RoomsPanel({'$parent': this.$el.find('#controlbox-panes')}); + this.roomspanel = new converse.RoomsPanel({'$parent': this.$el.find('.controlbox-panes')}); this.roomspanel.render(); } return this; diff --git a/mockup.html b/mockup.html index 84ad5a10d..45410e64b 100644 --- a/mockup.html +++ b/mockup.html @@ -27,7 +27,7 @@
  • Sign in
  • -
    +
    @@ -46,7 +46,7 @@
    -
    +