Merge pull request #2481 / [mod] template preferences: split into elements

HINT: this patch has no functional change / it is the preparation for following changes and bugfixes

Over the years, the preferences template became an unmanageable beast. To make the source code more readable the monolith is splitted into elements. The splitting into elements also has the advantage that a new template can make use of them.

The reversed checkbox is a quirk that is only used in the prefereces and must be eliminated in the long term. For this the macro 'checkbox_onoff_reversed' was added to the preferences.html template. The 'checkbox' macro is also a quirk of the preferences.html we don't want to use in other templates (it is an input-checkbox in a HTML form that was misused for status display).

1 files changed, 13 insertions, 9 deletions

diff --git a/searx/static/themes/simple/css/leaflet.css b/searx/static/themes/simple/css/leaflet.css
index 5292e63a1..2961b7618 100644
--- a/searx/static/themes/simple/css/leaflet.css
+++ b/searx/static/themes/simple/css/leaflet.css
@@ -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;

@@ -423,8 +428,11 @@ svg.leaflet-image-layer.leaflet-interactive path {
 .leaflet-control-attribution a:focus {

 	text-decoration: underline;

 	}

-.leaflet-control-attribution svg {

+.leaflet-attribution-flag {

 	display: inline !important;

+	vertical-align: baseline !important;

+	width: 1em;

+	height: 0.6669em;

 	}

 .leaflet-left .leaflet-control-scale {

 	margin-left: 5px;

@@ -438,12 +446,10 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	line-height: 1.1;

 	padding: 2px 5px 1px;

 	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;

@@ -537,8 +543,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 {

@@ -647,11 +651,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;

 		}

 	}