From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 29 Aug 2018 14:22:03 +0000 (-0400)
Subject: Merge tag 'v2.10.38' into develop
X-Git-Tag: v2.10.39^2~6
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d6be3205737c38a2d0eafc1bbf75ae82dbcc6476;p=WP-Plugins%2Fglm-member-db.git

Merge tag 'v2.10.38' into develop

Version 2.10.38
---

d6be3205737c38a2d0eafc1bbf75ae82dbcc6476
diff --cc views/front/members/list.html
index e8efa555,ada6f590..d6ac5def
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@@ -572,13 -572,6 +572,16 @@@
                  });
                {/if}
  
++<<<<<<< HEAD
 +                var mapContainerWidth = Number(leafletMap._container.clientWidth);
 +                var maxPopupWidth = .65 * mapContainerWidth;
 +                if (maxPopupWidth > 600) {
 +                    maxPopupWidth = 600;
 +                }
 +                var mapContainerHeight = Number(leafletMap._container.clientHeight);
 +                var maxPopupHeight = .7 * mapContainerHeight;
++=======
++>>>>>>> v2.10.38
  
                {foreach $mapItems as $m}
                  {if $m.lat != 0 && $m.lon != 0}