From 37c86b1f133b401ffe404fbe43cf72e9361022ea Mon Sep 17 00:00:00 2001 From: otrok7 <50595291+otrok7@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:47:10 +0200 Subject: [PATCH 1/3] update --- crouton.php | 2 +- croutonjs/meetingMap/css/meeting_map.css | 14 ++++++++++++++ croutonjs/meetingMap/js/meeting_map.js | 7 ++----- croutonjs/src/css/bmlt_tabs.css | 6 ------ readme.txt | 5 ++++- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/crouton.php b/crouton.php index 846a7cb0..4fcd42c2 100644 --- a/crouton.php +++ b/crouton.php @@ -5,7 +5,7 @@ Description: A tabbed based display for showing meeting information. Author: bmlt-enabled Author URI: https://bmlt.app -Version: 3.19.4 +Version: 3.19.5 */ /* Disallow direct access to the plugin file */ if (basename($_SERVER['PHP_SELF']) == basename(__FILE__)) { diff --git a/croutonjs/meetingMap/css/meeting_map.css b/croutonjs/meetingMap/css/meeting_map.css index a84ab5c9..a5aec0a7 100644 --- a/croutonjs/meetingMap/css/meeting_map.css +++ b/croutonjs/meetingMap/css/meeting_map.css @@ -509,4 +509,18 @@ background-color: #EEEEEE; } .gm-style .gm-style-iw-c { padding: 0px; + } + #bmlt-map button.gm-ui-hover-effect { + right: 0px; + z-index: 999; + width: 20px !important; + height: 20px !important; + } + .gm-ui-hover-effect>span { + position: relative; + bottom: 13px; + right: 13px; +} + #bmlt-map .gm-style-iw-chr { + height: 0 !important; } \ No newline at end of file diff --git a/croutonjs/meetingMap/js/meeting_map.js b/croutonjs/meetingMap/js/meeting_map.js index f384bbdb..2a0d793e 100644 --- a/croutonjs/meetingMap/js/meeting_map.js +++ b/croutonjs/meetingMap/js/meeting_map.js @@ -332,12 +332,11 @@ function MeetingMap(inConfig) { } } if (swipableModal) { - const body = document.getElementsByTagName("BODY")[0]; + const body = document.body; const scrollY = body.style.top; body.style.overflowX = g_overflowX; body.style.position = ''; body.style.top = ''; - body.style.width = ''; window.scrollTo(0, parseInt(scrollY || '0') * -1); } } @@ -362,11 +361,9 @@ function MeetingMap(inConfig) { const body = document.getElementsByTagName("BODY")[0]; g_overflowX = body.style.overflowX; const newTop = -window.scrollY+'px'; - const newWidth = window.width+'px'; body.style.overflowX = 'hidden'; body.style.position = 'fixed'; - body.style.top = newTop; - body.style.width = newWidth; + document.body.style.setProperty('top', newTop, 'important'); } } function showFilterDialog(e) { diff --git a/croutonjs/src/css/bmlt_tabs.css b/croutonjs/src/css/bmlt_tabs.css index f6f43997..8faa2996 100644 --- a/croutonjs/src/css/bmlt_tabs.css +++ b/croutonjs/src/css/bmlt_tabs.css @@ -572,12 +572,6 @@ table.tablesaw { } } -@media only screen and (max-width: 480px) { - #bmlt-tabs .bmlt-column3 { - width: auto; - } -} - .mapcontrolslabel { font-size: 12px; cursor: pointer; diff --git a/readme.txt b/readme.txt index 9fba6073..75d1ba00 100644 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,7 @@ Tags: na, meeting list, meeting finder, maps, recovery, addiction, webservant, b Requires at least: 4.0 Required PHP: 8.0 Tested up to: 6.4.2 -Stable tag: 3.19.4 +Stable tag: 3.19.5 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html crouton implements a Tabbed UI for BMLT. @@ -36,6 +36,9 @@ https://demo.bmlt.app/crouton == Changelog == += 3.19.5 = +* Fix InfoWindow close button on GoogleMaps + = 3.19.4 = * Bug fix From 26b1ddbcaa491d8bc1463b6fe1d4cad260d9fba8 Mon Sep 17 00:00:00 2001 From: otrok7 <50595291+otrok7@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:49:47 +0200 Subject: [PATCH 2/3] cleanup --- croutonjs/meetingMap/js/meeting_map.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/croutonjs/meetingMap/js/meeting_map.js b/croutonjs/meetingMap/js/meeting_map.js index 2a0d793e..08db2367 100644 --- a/croutonjs/meetingMap/js/meeting_map.js +++ b/croutonjs/meetingMap/js/meeting_map.js @@ -358,12 +358,12 @@ function MeetingMap(inConfig) { if (dd) dd.style.display = "none"; gDelegate.modalOn(); if (swipableModal) { - const body = document.getElementsByTagName("BODY")[0]; + const body = document.body; g_overflowX = body.style.overflowX; const newTop = -window.scrollY+'px'; body.style.overflowX = 'hidden'; body.style.position = 'fixed'; - document.body.style.setProperty('top', newTop, 'important'); + body.style.setProperty('top', newTop, 'important'); } } function showFilterDialog(e) { From 2a62a37a91df8a404bc374233106133d05cf5052 Mon Sep 17 00:00:00 2001 From: otrok7 <50595291+otrok7@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:31:08 +0200 Subject: [PATCH 3/3] tested up to --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 75d1ba00..cc4eb9a3 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Contributors: odathp, otrok7, radius314, pjaudiomv, californiasteve9390, Paul N, Tags: na, meeting list, meeting finder, maps, recovery, addiction, webservant, bmlt Requires at least: 4.0 Required PHP: 8.0 -Tested up to: 6.4.2 +Tested up to: 6.6.1 Stable tag: 3.19.5 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html