From 96910370eaf139c05f4c92821ce1c439236a78ea Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 9 Feb 2014 13:39:22 +0000 Subject: [PATCH] Userbox styling + removing footer --- client/assets/css/style.css | 4 ++-- client/src/views/channel.js | 1 + client/src/views/memberlist.js | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/client/assets/css/style.css b/client/assets/css/style.css index 27680ef..7c69af3 100644 --- a/client/assets/css/style.css +++ b/client/assets/css/style.css @@ -138,9 +138,9 @@ html, body { height:100%; } #kiwi .memberlists ul li a.nick { } /* The userbox shown when clicking a nick */ -#kiwi .userbox { position:relative; } +#kiwi .userbox { position:relative; width:100px; } #kiwi .userbox a { } -#kiwi .userbox a i { } +#kiwi .userbox a i { width:1em; text-align:center; } /* Emoticons */ diff --git a/client/src/views/channel.js b/client/src/views/channel.js index 2aa3430..cac5365 100644 --- a/client/src/views/channel.js +++ b/client/src/views/channel.js @@ -249,6 +249,7 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({ menubox = new _kiwi.view.MenuBox(member.get('nick') || 'User'); menubox.addItem('userbox', userbox.$el); + menu.showFooter(false); menubox.show(); // Position the userbox + menubox diff --git a/client/src/views/memberlist.js b/client/src/views/memberlist.js index a63099a..085148a 100644 --- a/client/src/views/memberlist.js +++ b/client/src/views/memberlist.js @@ -30,6 +30,7 @@ _kiwi.view.MemberList = Backbone.View.extend({ var menu = new _kiwi.view.MenuBox(member.get('nick') || 'User'); menu.addItem('userbox', userbox.$el); + menu.showFooter(false); menu.show(); // Position the userbox + menubox @@ -46,6 +47,11 @@ _kiwi.view.MemberList = Backbone.View.extend({ t = memberlist_bottom - menu.$el.outerHeight(); } + // If the top of the userbox is going to be too high.. lower it + if (t < 0){ + t = 0; + } + // If the right of the userbox is going off screen.. bring it in if (m_right > memberlist_right){ l = memberlist_right - menu.$el.outerWidth(); -- 2.25.1