v7.9.0

Dr-Mx · Dec 9, 2023 · be11274 · be11274
1 parent b64a190
commit be11274
Show file tree

Hide file tree

Showing 62 changed files with 1,328 additions and 644 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,11 @@
 web/assets/data/tides.json
 web/assets/maptiles/
-web/tour/*/*/*
+web/tour/*/img/
 web/assets/other/*
 web/assets/img/uploads/
 web/assets/js/config.js
 web/robots.txt
+*.pdf
 
 #############
 ## Windows detritus

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # CHANGELOG
 
+## v7.9.0
+
+**Date:** 09/12/2023
+
+Updated
+ - fontawesome 6.5.1
+
+Site changes
+ - Redesigned images in popup so attribution and navigation controls are shown overlayed
+ - Hide tooltip if popup is open
+ - Add option to use screen as a bounding box in dev tools
+ - RAF overlays
+ - Tracestrack basemap
+ - Xmas updates
+ - Update Manor House tour with more detail
+ - Links to guided walks
+ - More of the usual bug fixes and code improvements
+
+
 ## v7.8.0
 
 **Date:** 18/09/2023

diff --git a/web/.htaccess b/web/.htaccess
@@ -8,12 +8,13 @@ RewriteCond %{HTTPS} on
 RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
 RewriteRule ^(.*)$ https://%1/$1 [R=301,L]
 
-Redirect /ww2 /?M=general&T=tour&U=ww2&G=bombmap
-Redirect /xmas /?M=bosm&T=none&G=xmas
-Redirect /scarecrow /?M=general&T=none&G=scarecrow
 Redirect /ext /?M=general&T=none#13/50.8470/0.4670
+Redirect /scarecrow /?M=general&T=none&G=scarecrow
 Redirect /streetnames /tour/itemStreetNames/streetnames.xml
+Redirect /manorhouse /?T=tour&G=manorHouse&U=manor&O=os1955
 Redirect /millifest /?T=none&G=milligan
+Redirect /ww2 /?M=general&T=tour&G=bombmap&U=ww2
+Redirect /xmas /?T=none&G=xmas
 
 # php -- BEGIN cPanel-generated handler, do not edit
 # This domain inherits the “PHP” package.

diff --git a/web/assets/css/dark-theme.css b/web/assets/css/dark-theme.css
@@ -1,10 +1,10 @@
 :root {
 	--text-color: #aaaaaa;
 	--hover-color: #999999;
-	--bg-color: #0c0c0d;
-	--bg-color2: rgba(35, 35, 39, 0.95);
+	--bg-color: #111111;
+	--bg-color2: rgba(35, 35, 39, 0.9);
 	--scr-thumb: #555555;
-	--scr-track: #0c0c0d;
+	--scr-track: #111111;
 	--scroll-shadow: 0, 0, 0;
 	--scroll-shadow-popup: 0, 0, 0;
 }
@@ -21,23 +21,18 @@
 .popup-ohContainer .popup-tagValue:hover::after, .leaflet-control-layers-list input:not(:checked,:disabled) + span:hover:before {
 	color: var(--hover-color) !important;
 }
-.sidebar-tabs, #creditFooter, #homeBox, #xmasMsg, .anchor, input:not([type="range"]), hr, select, button, .leaflet-control-geocoder input, .slider::before,
+.sidebar-tabs, footer, #homeBox, #xmasMsg, .anchor, input:not([type="range"]), hr, select, button, .leaflet-control-geocoder input, .slider::before,
 .leaflet-control-geocoder, .leaflet-contextmenu, #msgStatusHead, .leaflet-container a.leaflet-popup-close-button, .leaflet-control-geocoder-selected, .fancybox-bg,
 #poi-results-list tr:hover, .poi-checkbox-selected, .poi-checkbox > label:hover, .leaflet-touch .leaflet-bar:not(#inputWw2, #inputOpacity), #walking a img {
 	background-color: var(--bg-color) !important;
 }
-#msgStatusBody, #inputOpacity, .leaflet-bar > a, .leaflet-bar button, .leaflet-popup-content-wrapper, .leaflet-popup-tip, .sidebar-content, .leaflet-control-layers-expanded,
-.leaflet-control-layers, .leaflet-control-geocoder, .leaflet-control-geocoder-alternatives, .leaflet-control-geocoder-alternatives li:hover, .leaflet-tooltip {
+#msgStatus, #inputOpacity, .leaflet-bar > a, .leaflet-bar button, .leaflet-popup-content-wrapper, .leaflet-popup-tip, .sidebar-content, .leaflet-control-layers-expanded, .leaflet-control-layers,
+.leaflet-control-geocoder, .leaflet-control-geocoder-alternatives, .leaflet-control-geocoder-alternatives li:hover, .leaflet-tooltip, .popup-imgAttrib, .navigateBg {
 	background-color: var(--bg-color2) !important;
 }
 .leaflet-control-layers-list input + span:before {
 	color: #444444;
 }
-@media (min-width: 1024px) {
-	.sidebar.collapsed .sidebar-tabs {
-		background-color: rgba(0, 0, 0, 0.5) !important;
-	}
-}
 #weather, #newFeed ul {
 	color: #688c81;
 }
@@ -47,6 +42,9 @@
 .leaflet-bar a:last-child {
 	border-bottom: none;
 }
+#devTools {
+	border-top: 1px solid var(--bg-color);
+}
 #inputOpacity input[type=range] {
 	background-image: linear-gradient(to right, #333, #666);
 }
@@ -57,15 +55,15 @@ input[type=range] {
 	scrollbar-color: var(--scr-thumb) var(--scr-track) !important;
 }
 .layerDark, #minimap > img {
-	filter: invert(90%) hue-rotate(180deg) contrast(0.8);
+	filter: invert(90%) hue-rotate(180deg) contrast(80%);
 }
 .sidebar-header {
 	color: #dddddd;
 }
 .leaflet-control-layers-separator {
 	border-top: 2px solid var(--bg-color);
 }
-#poi-results, #walkDesc img, #thennow img, #myprofile img, .popup-imgContainer > a > img, .leaflet-touch .leaflet-control-layers, .leaflet-touch .leaflet-bar:not(#inputWw2) {
+#poi-results, #walkDesc img, #thennow img, #myprofile img, .popup-imgContainer, .leaflet-touch .leaflet-control-layers, .leaflet-touch .leaflet-bar:not(#inputWw2) {
 	border: 2px solid var(--bg-color);
 }
 input[type=range]::-webkit-slider-thumb { border-color: var(--bg-color); }
@@ -113,7 +111,7 @@ input:not([type=range]), select, #sidebar button:not(.modalButton), .leaflet-too
 	background-color: rgba(12, 12, 13, 0.5) !important;
 }
 .popup-fhrs > a > img {
-	filter: brightness(75%);
+	opacity: 75%;
 }
 .leaflet-container a.leaflet-popup-close-button {
 	border: 3px solid #333333;
@@ -146,6 +144,9 @@ input:not([type=range]), select, #sidebar button:not(.modalButton), .leaflet-too
 .xmasMapTree { filter: drop-shadow(0px 10px 9px #000000); }
 .circleMarker { fill: #000000; }
 .poi-results-circleMarker { color: #000000; }
+.popup-xmas .leaflet-popup-content-wrapper, .leaflet-tooltip.popup-xmas, #xmasMsg {
+	background-blend-mode: lighten;
+}
 
 .custscroll::-webkit-scrollbar {
 	background-color: var(--scr-track);
@@ -160,4 +161,4 @@ input:not([type=range]), select, #sidebar button:not(.modalButton), .leaflet-too
 }
 .comment, figcaption {
 	color: #888888;
-}
+}
diff --git a/web/assets/css/plugins/leaflet-sidebar.css b/web/assets/css/plugins/leaflet-sidebar.css
@@ -38,7 +38,8 @@
 	opacity : 0; }
 @media (min-width: 1024px) {
 	.sidebar.collapsed .sidebar-tabs {
-		background-color: rgba(204, 204, 204, 0.5);
+		background-color: transparent !important;
+		backdrop-filter: blur(7px);
 		transition: background-color 400ms ease-out; }
 	.sidebar.collapsed {
 		width: 35px;
@@ -99,8 +100,9 @@
 	position: absolute;
 	top: 0;
 	bottom: 0;
-	background-color: rgba(235, 235, 235, 0.95);
-	overflow: hidden; }
+	background-color: rgba(235, 235, 235, 0.8);
+	overflow: hidden;
+	backdrop-filter: blur(7px); }
 @media (min-width: 768px) and (max-width: 1023px) {
 	.sidebar-content {
 		background-color: #ececec; } }