diff --git a/README.md b/README.md index afd73b95..ba4c719d 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ Contributors ------------ [Bananeweizen](https://github.com/Bananeweizen), +[cmrn](https://github.com/cmrn), [epf](https://github.com/epf), [integ3r](https://github.com/integ3r), [JasonMillward](https://github.com/JasonMillward), diff --git a/code/boot.js b/code/boot.js index ec9be61c..b4d927ba 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") @@ -169,6 +170,25 @@ window.setupPlayerStat = function() { ); } +window.setupSidebarToggle = function() { + $('#sidebartoggle').on('click', function() { + var toggle = $('#sidebartoggle'); + var sidebar = $('#sidebar'); + if(sidebar.is(':visible')) { + sidebar.hide(); + $('#map').css('margin-right','0'); + toggle.html('◢
◥'); + toggle.css('right', '0'); + } else { + sidebar.show(); + $('#map').css('margin-right', SIDEBAR_WIDTH+2+'px'); + toggle.html('◣
◤'); + toggle.css('right', SIDEBAR_WIDTH+'px'); + } + window.map.invalidateSize(false); + }); +} + // BOOTING /////////////////////////////////////////////////////////// @@ -179,6 +199,7 @@ function boot() { window.setupGeosearch(); window.setupRedeem(); window.setupLargeImagePreview(); + window.setupSidebarToggle(); window.updateGameScore(); window.setupPlayerStat(); window.chat.setup(); diff --git a/main.js b/main.js index c3453b4a..6f722903 100644 --- a/main.js +++ b/main.js @@ -71,6 +71,7 @@ document.getElementsByTagName('body')[0].innerHTML = '' + '
' + '' + '' + + '
' + '
' // enable scrolling for small screens + '