From 9c56d64447e96194e1acefbb5abafb06e89d8cc8 Mon Sep 17 00:00:00 2001 From: Cameron Moon Date: Mon, 11 Feb 2013 09:42:18 +1100 Subject: [PATCH] Made toggle arrow longer & removed unneeded DOM manipulations --- code/boot.js | 15 +++++++-------- main.js | 2 +- style.css | 4 +++- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/code/boot.js b/code/boot.js index 692f5b79..61bee82c 100644 --- a/code/boot.js +++ b/code/boot.js @@ -35,6 +35,7 @@ window.setupStyles = function() { '#chat { height: '+CHAT_SHRINKED+'px; } ', '#updatestatus { width:'+(SIDEBAR_WIDTH-2*4)+'px; } ', '#sidebar { width:'+(SIDEBAR_WIDTH + HIDDEN_SCROLLBAR_ASSUMED_WIDTH + 2 /*border*/)+'px; } ', + '#sidebartoggle { right:'+SIDEBAR_WIDTH+'px; } ', '#scrollwrapper { width:'+(SIDEBAR_WIDTH + 2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH)+'px; right:-'+(2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH-2)+'px } ', '#sidebar input, h2, #updatestatus { width:'+(SIDEBAR_WIDTH - 2*4)+'px !important } ', '#sidebar > *, #gamestat span, .imgpreview img { width:'+SIDEBAR_WIDTH+'px; }'].join("\n") @@ -155,21 +156,19 @@ window.setupPlayerStat = function() { } window.setupSidebarToggle = function() { - var toggle = $('#sidebartoggle'); - var sidebar = $('#sidebar'); - toggle.text('▶'); - toggle.css('right', SIDEBAR_WIDTH+2+'px'); - toggle.on('click', function() { + $('#sidebartoggle').on('click', function() { + var toggle = $('#sidebartoggle'); + var sidebar = $('#sidebar'); if(sidebar.is(':visible')) { sidebar.hide(); $('#map').css('margin-right','0'); - toggle.text('◀'); + toggle.html('◢
◥'); toggle.css('right', '0'); } else { sidebar.show(); $('#map').css('margin-right', SIDEBAR_WIDTH+2+'px'); - toggle.text('▶'); - toggle.css('right', SIDEBAR_WIDTH+2+'px'); + toggle.html('◣
◤'); + toggle.css('right', SIDEBAR_WIDTH+'px'); } window.map.invalidateSize(false); }); diff --git a/main.js b/main.js index bcce7121..2d13ae10 100644 --- a/main.js +++ b/main.js @@ -58,7 +58,7 @@ document.getElementsByTagName('body')[0].innerHTML = '' + '
' + '' + '' - + '' + + '
' + '
' // enable scrolling for small screens + '