From ff6d2614071dccb896a6798cfcf4a788a9922b10 Mon Sep 17 00:00:00 2001 From: hastarin Date: Thu, 9 May 2013 00:50:12 +1000 Subject: [PATCH] Tweaks to mobile for portal_highlighter and others. --- code/portal_highlighter.js | 4 ++-- code/window_management.js | 7 +++++++ mobile/smartphone.css | 25 +++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/code/portal_highlighter.js b/code/portal_highlighter.js index e36274d9..bd945865 100644 --- a/code/portal_highlighter.js +++ b/code/portal_highlighter.js @@ -33,7 +33,7 @@ window.portalHighlighterControl = function() { }); $("#portal_highlight_select").val(_current_highlighter); $("#portal_highlight_select").change(function(){ changePortalHighlights($(this).val());}); - $(".leaflet-top.leaflet-left").css('padding-top','25px'); + $(".leaflet-top.leaflet-left").css('padding-top', window.isSmartphone ? '55px' : '20px'); $(".leaflet-control-scale-line").css('margin-top','25px'); } } @@ -61,4 +61,4 @@ window.resetHighlightedPortals = function() { } catch(e) {} }); -} \ No newline at end of file +} diff --git a/code/window_management.js b/code/window_management.js index 8da89133..99ffdc59 100644 --- a/code/window_management.js +++ b/code/window_management.js @@ -1,6 +1,7 @@ // created to start cleaning up "window" interaction // window.show = function(id) { + window.hideall(); switch(id) { case 'full': window.chat.show('full'); @@ -19,6 +20,7 @@ window.show = function(id) { break; case 'map': window.smartphone.mapButton.click(); + $('#portal_highlight_select').show(); break; case 'info': window.smartphone.sideButton.click(); @@ -28,3 +30,8 @@ window.show = function(id) { break; } } + +window.hideall = function() { + $('#chatcontrols, #chat, #chatinput, #sidebartoggle, #scrollwrapper, #updatestatus, #portal_highlight_select').hide(); + $('#map').css('visibility', 'hidden'); +} diff --git a/mobile/smartphone.css b/mobile/smartphone.css index 26efe8e7..6feda6e9 100644 --- a/mobile/smartphone.css +++ b/mobile/smartphone.css @@ -8,7 +8,8 @@ body { } .leaflet-top .leaflet-control { - margin-top: 0 !important; + margin-top: 5px !important; + margin-left: 5px !important; } .leaflet-control-layers { @@ -16,12 +17,6 @@ body { margin-top: 0 !important; } -.leaflet-top .leaflet-control-zoom { - margin-left: 5px !important; - margin-top: 30px !important; -} - - #geosearch { width: 100%; } @@ -129,6 +124,11 @@ body { display: none; } +.leaflet-control-layers-toggle { + width: 50px !important; + height: 50px !important; +} + .leaflet-control-layers-list label { padding: 6px 0; } @@ -138,13 +138,6 @@ body { } #portal_highlight_select{ - position: absolute; - top:42px; - left:310px; - z-index: 9999; - font-size:11px; - font-family: "coda",arial,helvetica,sans-serif; - background-color:#0E3C46; - color:#ffce00; - + top:0px !important; + left:60px !important; }