From e761a01aed4d492ec20e386a1741920bd6e9e76a Mon Sep 17 00:00:00 2001 From: Cameron Moon Date: Tue, 12 Feb 2013 08:58:06 +1100 Subject: [PATCH] fixed various minor sidebar layout issues --- code/boot.js | 2 +- dist/style.css | 10 +++------- main.js | 1 - style.css | 10 +++------- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/code/boot.js b/code/boot.js index 57e6ebe9..f27ec694 100644 --- a/code/boot.js +++ b/code/boot.js @@ -36,7 +36,7 @@ window.setupStyles = function() { '.leaflet-right { margin-right: '+(SIDEBAR_WIDTH+1)+'px } ', '#updatestatus { width:'+(SIDEBAR_WIDTH-2*4+1)+'px; } ', '#sidebar { width:'+(SIDEBAR_WIDTH + HIDDEN_SCROLLBAR_ASSUMED_WIDTH + 1 /*border*/)+'px; } ', - '#sidebartoggle { right:'+SIDEBAR_WIDTH+'px; } ', + '#sidebartoggle { right:'+(SIDEBAR_WIDTH+1)+'px; } ', '#scrollwrapper { width:'+(SIDEBAR_WIDTH + 2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH)+'px; right:-'+(2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH-2)+'px } ', '#sidebar input, h2 { width:'+(SIDEBAR_WIDTH - 2*4)+'px !important } ', '#sidebar > *, #gamestat span, .imgpreview img { width:'+SIDEBAR_WIDTH+'px; }'].join("\n") diff --git a/dist/style.css b/dist/style.css index 6fb01ecd..43abdb69 100644 --- a/dist/style.css +++ b/dist/style.css @@ -36,10 +36,10 @@ body { #sidebartoggle { display: block; padding: 20px 5px; - margin-top: -31px; + margin-top: -31px; /* -(toggle height / 2) */ line-height: 10px; position: absolute; - top: 50%; + top: 340px; /* (sidebar height / 2) */ z-index: 3001; background-color: rgba(8, 48, 78, 0.9); color: #FFCE00; @@ -561,10 +561,6 @@ aside:nth-child(odd) span { padding: 5px; } -#spacer { - height: 10px; -} - /* a common portal display takes this much space (prevents moving * content when first selecting a portal) */ @@ -575,7 +571,7 @@ aside:nth-child(odd) span { /* update status */ #updatestatus { - background-color: rgba(8, 48, 78, 1); + background-color: rgba(8, 48, 78, 0.9); border-bottom: 0; border-top: 1px solid #20A8B1; border-left: 1px solid #20A8B1; diff --git a/main.js b/main.js index 96f0a63c..64a0967d 100644 --- a/main.js +++ b/main.js @@ -79,7 +79,6 @@ document.getElementsByTagName('body')[0].innerHTML = '' + '
' + ' ' + '
permalink
' - + '
' + ' ' + '' + '
'; diff --git a/style.css b/style.css index bec15a62..652db7a3 100644 --- a/style.css +++ b/style.css @@ -50,10 +50,10 @@ body { #sidebartoggle { display: block; padding: 20px 5px; - margin-top: -31px; + margin-top: -31px; /* -(toggle height / 2) */ line-height: 10px; position: absolute; - top: 50%; + top: 340px; /* (sidebar height / 2) */ z-index: 3001; background-color: rgba(8, 48, 78, 0.9); color: #FFCE00; @@ -575,10 +575,6 @@ aside:nth-child(odd) span { padding: 5px; } -#spacer { - height: 10px; -} - /* a common portal display takes this much space (prevents moving * content when first selecting a portal) */ @@ -589,7 +585,7 @@ aside:nth-child(odd) span { /* update status */ #updatestatus { - background-color: rgba(8, 48, 78, 1); + background-color: rgba(8, 48, 78, 0.9); border-bottom: 0; border-top: 1px solid #20A8B1; border-left: 1px solid #20A8B1;