Skip to content

Commit

Permalink
v7.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dr-Mx
Dr-Mx committed Jul 9, 2023
1 parent 3bde0d0 commit 20acacb
Show file tree
Hide file tree
Showing 22 changed files with 299 additions and 180 deletions.
18 changes: 17 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# CHANGELOG

## v7.7.0

**Date:** 09/07/2023

Updated
- leaflet.js 1.9.4
- jquery.js 3.7.0

Site changes
- Enable lazy loading of most images in sidebar
- Emoticons added to tour index
- Refactored settings menu
- 1795 Yeakell & Gardener overlay
- More of the usual bug fixes and code improvements


## v7.6.0

**Date:** 15/05/2023
Expand Down Expand Up @@ -763,7 +779,7 @@ Site changes
- New sidebar icons
- Custom POI icons for food cuisine and various other elements
- Adjusted sidebar sizes slightly
- Added Yeakell & Gardener 1776 overlay
- Added Yeakell & Gardener 1778 overlay


## v2.10.0 - POI result list
Expand Down
14 changes: 8 additions & 6 deletions web/assets/css/dark-theme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ input:not([type=range]), select, #sidebar button:not(.modalButton), .leaflet-too
.leaflet-popup .award {
text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5), 0 0 15px black;
}
.leaflet-tooltip-right::before {
border-right-color: var(--bg-color);
}
.leaflet-tooltip-right::before { border-right-color: var(--bg-color2); }
.leaflet-tooltip-left::before { border-left-color: var(--bg-color2); }
.leaflet-tooltip-top::before { border-top-color: var(--bg-color2); }
.leaflet-tooltip-bottom::before { border-bottom-color: var(--bg-color2); }
.modalButton {
background-color: #222 !important;
}
Expand All @@ -140,9 +141,10 @@ input:not([type=range]), select, #sidebar button:not(.modalButton), .leaflet-too
.popup-ohTable td.weekend { background-color: #444444; }
.sidebar-close:hover { color: #bbbbbb; }
.sidebar-notif { border-color: var(--bg-color); }
.xmasMapTree {
filter: drop-shadow(0px 10px 9px #000000);
}
.xmasMapTree { filter: drop-shadow(0px 10px 9px #000000); }
.circleMarker { fill: #000000; }
.poi-results-circleMarker { color: #000000; }

.custscroll::-webkit-scrollbar {
background-color: var(--scr-track);
}
Expand Down
90 changes: 52 additions & 38 deletions web/assets/css/plugins/leaflet.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@
padding: 0;
}

.leaflet-container img.leaflet-tile {
/* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
mix-blend-mode: plus-lighter;
}

.leaflet-container.leaflet-touch-zoom {
-ms-touch-action: pan-x pan-y;
touch-action: pan-x pan-y;
Expand Down Expand Up @@ -185,6 +190,9 @@
-ms-transform-origin: 0 0;
transform-origin: 0 0;
}
svg.leaflet-zoom-animated {
will-change: transform;
}

.leaflet-zoom-anim .leaflet-zoom-animated {
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
Expand Down Expand Up @@ -249,6 +257,9 @@ svg.leaflet-image-layer.leaflet-interactive path {

/* visual tweaks */

.leaflet-container :focus:not(:focus-visible) {
outline: 0;
}
.leaflet-container {
background: #ddd;
outline-offset: 1px;
Expand All @@ -264,16 +275,18 @@ svg.leaflet-image-layer.leaflet-interactive path {

/* general typography */
.leaflet-container {
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
font: 0.75rem/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
font-size: 12px;
font-size: 0.75rem;
line-height: 1.5;
}


/* general toolbar styles */

.leaflet-bar {
box-shadow: 0 1px 5px rgb(0 0 0 / 40%);
border-radius: 10px;
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
border-radius: 4px;
}
.leaflet-bar a {
background-color: #fff;
Expand All @@ -297,12 +310,12 @@ svg.leaflet-image-layer.leaflet-interactive path {
background-color: #f4f4f4;
}
.leaflet-bar a:first-child {
border-top-left-radius: 10px;
border-top-right-radius: 10px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.leaflet-bar a:last-child {
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
border-bottom: none;
}
.leaflet-bar a.leaflet-disabled {
Expand All @@ -317,12 +330,12 @@ svg.leaflet-image-layer.leaflet-interactive path {
line-height: 30px;
}
.leaflet-touch .leaflet-bar a:first-child {
border-top-left-radius: 10px;
border-top-right-radius: 10px;
border-top-left-radius: 2px;
border-top-right-radius: 2px;
}
.leaflet-touch .leaflet-bar a:last-child {
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
}

/* zoom control */
Expand All @@ -343,7 +356,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
.leaflet-control-layers {
box-shadow: 0 1px 5px rgba(0,0,0,0.4);
background: #fff;
border-radius: 10px;
border-radius: 5px;
}
.leaflet-control-layers-toggle {
background-image: url(images/layers.png);
Expand Down Expand Up @@ -383,6 +396,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
}
.leaflet-control-layers label {
display: block;
font-size: 13px;
font-size: 1.08333em;
}
.leaflet-control-layers-separator {
height: 0;
Expand All @@ -400,13 +415,14 @@ svg.leaflet-image-layer.leaflet-interactive path {

.leaflet-container .leaflet-control-attribution {
background: #fff;
background: rgba(255, 255, 255, 0.7);
background: rgba(255, 255, 255, 0.8);
margin: 0;
}
.leaflet-control-attribution,
.leaflet-control-scale-line {
padding: 0 5px;
color: #333;
line-height: 1.4;
}
.leaflet-control-attribution a {
text-decoration: none;
Expand All @@ -415,11 +431,6 @@ svg.leaflet-image-layer.leaflet-interactive path {
.leaflet-control-attribution a:focus {
text-decoration: underline;
}
.leaflet-container .leaflet-control-attribution,
.leaflet-container .leaflet-control-scale {
font-size: 11px;
font-size: 0.69rem;
}
.leaflet-left .leaflet-control-scale {
margin-left: 5px;
}
Expand All @@ -431,15 +442,11 @@ svg.leaflet-image-layer.leaflet-interactive path {
border-top: none;
line-height: 1.1;
padding: 2px 5px 1px;
font-size: 11px;
font-size: 0.69rem;
white-space: nowrap;
overflow: hidden;
-moz-box-sizing: border-box;
box-sizing: border-box;

background: #fff;
background: rgba(255, 255, 255, 0.5);
background: rgba(255, 255, 255, 0.8);
text-shadow: 1px 1px #fff;
}
.leaflet-control-scale-line:not(:first-child) {
border-top: 2px solid #777;
Expand All @@ -450,9 +457,14 @@ svg.leaflet-image-layer.leaflet-interactive path {
border-bottom: 2px solid #777;
}

.leaflet-touch .leaflet-control-attribution,
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
border: 2px solid white;
box-shadow: none;
}
.leaflet-touch .leaflet-control-layers,
.leaflet-touch .leaflet-bar {
border: 2px solid rgba(0,0,0,0.2);
background-clip: padding-box;
}

Expand All @@ -467,14 +479,18 @@ svg.leaflet-image-layer.leaflet-interactive path {
.leaflet-popup-content-wrapper {
padding: 1px;
text-align: left;
border-radius: 10px;
border-radius: 12px;
}
.leaflet-popup-content {
margin: 13px 19px;
line-height: 1.4;
margin: 13px 24px 13px 20px;
line-height: 1.3;
font-size: 13px;
font-size: 1.08333em;
min-height: 1px;
}
.leaflet-popup-content p {
margin: 18px 0;
margin: 17px 0;
margin: 1.3em 0;
}
.leaflet-popup-tip-container {
width: 40px;
Expand Down Expand Up @@ -509,12 +525,11 @@ svg.leaflet-image-layer.leaflet-interactive path {
position: absolute;
top: 0;
right: 0;
padding: 4px 4px 0 0;
border: none;
text-align: center;
width: 18px;
height: 14px;
font: 16px/14px Tahoma, Verdana, sans-serif;
width: 24px;
height: 24px;
font: 16px/24px Tahoma, Verdana, sans-serif;
color: #757575;
text-decoration: none;
background: transparent;
Expand All @@ -525,8 +540,6 @@ svg.leaflet-image-layer.leaflet-interactive path {
}
.leaflet-popup-scrolled {
overflow: auto;
border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
}

.leaflet-oldie .leaflet-popup-content-wrapper {
Expand Down Expand Up @@ -570,6 +583,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
pointer-events: none;
box-shadow: 0 1px 3px rgba(0,0,0,0.4);
}
.leaflet-tooltip.leaflet-interactive {
Expand Down Expand Up @@ -634,11 +648,11 @@ svg.leaflet-image-layer.leaflet-interactive path {
}

/* Printing */

@media print {
/* Prevent printers from removing background-images of controls. */
.leaflet-control {
-webkit-print-color-adjust: exact;
color-adjust: exact;
print-color-adjust: exact;
}
}
Loading

0 comments on commit 20acacb

Please sign in to comment.