From f8528b845907b0ccd2b48d82fa13065991aa8d18 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Wed, 20 Aug 2014 14:34:35 -0400 Subject: [PATCH] Map resizing finally complete. Apparently Firefox mobile viewer is off by ~60 pixels. Had to change media queries. --- Toolkit/Members/Map.php | 4 ++-- Toolkit/Members/css/member.css | 37 +++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/Toolkit/Members/Map.php b/Toolkit/Members/Map.php index d3900d3..037a18d 100644 --- a/Toolkit/Members/Map.php +++ b/Toolkit/Members/Map.php @@ -89,9 +89,9 @@ class Toolkit_Members_Map public function toHtml($class="small-12 medium-6 large-6 columns", $id = "map-canvas", $h = "500px", $w = "100%") { if (!$this->hasSearchForm) { - $class = "small-12 medium-6 medium-offset-3 large-6 large-offset-3 columns left"; + $class = "small-12 medium-8 medium-offset-2 large-6 large-offset-3 columns"; } else { - $class .= " right"; + $class .= " category-search-map-sibling"; } $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'Toolkit/Members/libjs/google-map.js'; diff --git a/Toolkit/Members/css/member.css b/Toolkit/Members/css/member.css index a414954..37d6dae 100755 --- a/Toolkit/Members/css/member.css +++ b/Toolkit/Members/css/member.css @@ -1312,25 +1312,42 @@ div.thumb { float:left; }*/ +/** Button **/ +#SearchForm fieldset ol li:last-child { + text-align:center; +} + /** map foundation **/ -@media (min-width: 574px) and (max-width: 766px) { - #mapContainer, - #category-search { - width:100%; - margin-left:auto; - margin-right: auto; - max-width: 500px; - float: none; +@media (min-width: 634px) { + .category-search-map-sibling { + float: left !important; } #map-canvas { margin-top: 20px; margin-bottom: 25px; } +} +@media (max-width: 633px) { + .category-search-map-sibling { + margin-left:auto !important; + margin-right: auto !important; + max-width:500px; + width:100%; + float: none !important; + } #category-search { + width:100%; + margin-left:auto; + margin-right: auto; + max-width: 500px; + float: none; padding-bottom: 25px; padding-top: 20px; } } -#SearchForm fieldset ol li:last-child { - text-align:center; +.category-search-map-sibling { + float: none; + max-width: 500px; + margin-left: auto; + margin-right: auto; } -- 2.17.1