Merge pull request #1272 from dalf/issue-1270

Theme: enable autofocus of #q only on the index page and when the width > 50em

searx/static/themes/simple/css/leaflet.css

@@ -45,10 +45,7 @@
 	}
 /* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
 /* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
-.leaflet-container .leaflet-overlay-pane svg {
+.leaflet-container .leaflet-overlay-pane svg,
-	max-width: none !important;
-	max-height: none !important;
-	}
 .leaflet-container .leaflet-marker-pane img,
 .leaflet-container .leaflet-shadow-pane img,
 .leaflet-container .leaflet-tile-pane img,
@@ -56,8 +53,6 @@
 .leaflet-container .leaflet-tile {
 	max-width: none !important;
 	max-height: none !important;
-	width: auto;
-	padding: 0;
 	}
 
 .leaflet-container.leaflet-touch-zoom {
@@ -171,6 +166,9 @@
 
 /* zoom and fade animations */
 
+.leaflet-fade-anim .leaflet-tile {
+	will-change: opacity;
+	}
 .leaflet-fade-anim .leaflet-popup {
 	opacity: 0;
 	-webkit-transition: opacity 0.2s linear;
@@ -185,10 +183,9 @@
 	    -ms-transform-origin: 0 0;
 	        transform-origin: 0 0;
 	}
-svg.leaflet-zoom-animated {
+.leaflet-zoom-anim .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);
 	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
@@ -254,11 +251,14 @@ svg.leaflet-image-layer.leaflet-interactive path {
 
 .leaflet-container {
 	background: #ddd;
-	outline-offset: 1px;
+	outline: 0;
 	}
 .leaflet-container a {
 	color: #0078A8;
 	}
+.leaflet-container a.leaflet-active {
+	outline: 2px solid orange;
+	}
 .leaflet-zoom-box {
 	border: 2px dotted #38f;
 	background: rgba(255,255,255,0.5);
@@ -267,10 +267,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 
 /* general typography */
 .leaflet-container {
-	font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-size: 0.75rem;
-	line-height: 1.5;
 	}
 
 
@@ -280,7 +277,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	box-shadow: 0 1px 5px rgba(0,0,0,0.65);
 	border-radius: 4px;
 	}
-.leaflet-bar a {
+.leaflet-bar a,
+.leaflet-bar a:hover {
 	background-color: #fff;
 	border-bottom: 1px solid #ccc;
 	width: 26px;
@@ -297,8 +295,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	background-repeat: no-repeat;
 	display: block;
 	}
-.leaflet-bar a:hover,
+.leaflet-bar a:hover {
-.leaflet-bar a:focus {
 	background-color: #f4f4f4;
 	}
 .leaflet-bar a:first-child {
@@ -388,8 +385,6 @@ 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;
@@ -398,7 +393,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	}
 
 /* Default icon URLs */
-.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */
+.leaflet-default-icon-path {
 	background-image: url(images/marker-icon.png);
 	}
 
@@ -407,24 +402,23 @@ svg.leaflet-image-layer.leaflet-interactive path {
 
 .leaflet-container .leaflet-control-attribution {
 	background: #fff;
-	background: rgba(255, 255, 255, 0.8);
+	background: rgba(255, 255, 255, 0.7);
 	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;
 	}
-.leaflet-control-attribution a:hover,
+.leaflet-control-attribution a:hover {
-.leaflet-control-attribution a:focus {
 	text-decoration: underline;
 	}
-.leaflet-control-attribution svg {
+.leaflet-container .leaflet-control-attribution,
-	display: inline !important;
+.leaflet-container .leaflet-control-scale {
+	font-size: 11px;
 	}
 .leaflet-left .leaflet-control-scale {
 	margin-left: 5px;
@@ -437,6 +431,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	border-top: none;
 	line-height: 1.1;
 	padding: 2px 5px 1px;
+	font-size: 11px;
 	white-space: nowrap;
 	overflow: hidden;
 	-moz-box-sizing: border-box;
@@ -479,22 +474,17 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	border-radius: 12px;
 	}
 .leaflet-popup-content {
-	margin: 13px 24px 13px 20px;
+	margin: 13px 19px;
-	line-height: 1.3;
+	line-height: 1.4;
-	font-size: 13px;
-	font-size: 1.08333em;
-	min-height: 1px;
 	}
 .leaflet-popup-content p {
-	margin: 17px 0;
+	margin: 18px 0;
-	margin: 1.3em 0;
 	}
 .leaflet-popup-tip-container {
 	width: 40px;
 	height: 20px;
 	position: absolute;
 	left: 50%;
-	margin-top: -1px;
 	margin-left: -20px;
 	overflow: hidden;
 	pointer-events: none;
@@ -505,7 +495,6 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	padding: 1px;
 
 	margin: -10px auto 0;
-	pointer-events: auto;
 
 	-webkit-transform: rotate(45deg);
 	   -moz-transform: rotate(45deg);
@@ -522,18 +511,19 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	position: absolute;
 	top: 0;
 	right: 0;
+	padding: 4px 4px 0 0;
 	border: none;
 	text-align: center;
-	width: 24px;
+	width: 18px;
-	height: 24px;
+	height: 14px;
-	font: 16px/24px Tahoma, Verdana, sans-serif;
+	font: 16px/14px Tahoma, Verdana, sans-serif;
-	color: #757575;
+	color: #c3c3c3;
 	text-decoration: none;
+	font-weight: bold;
 	background: transparent;
 	}
-.leaflet-container a.leaflet-popup-close-button:hover,
+.leaflet-container a.leaflet-popup-close-button:hover {
-.leaflet-container a.leaflet-popup-close-button:focus {
+	color: #999;
-	color: #585858;
 	}
 .leaflet-popup-scrolled {
 	overflow: auto;
@@ -551,6 +541,9 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
 	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
 	}
+.leaflet-oldie .leaflet-popup-tip-container {
+	margin-top: -1px;
+	}
 
 .leaflet-oldie .leaflet-control-zoom,
 .leaflet-oldie .leaflet-control-layers,
@@ -585,7 +578,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	pointer-events: none;
 	box-shadow: 0 1px 3px rgba(0,0,0,0.4);
 	}
-.leaflet-tooltip.leaflet-interactive {
+.leaflet-tooltip.leaflet-clickable {
 	cursor: pointer;
 	pointer-events: auto;
 	}
@@ -645,13 +638,3 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	margin-left: -12px;
 	border-right-color: #fff;
 	}
-
-/* Printing */
-	
-@media print {
-	/* Prevent printers from removing background-images of controls. */
-	.leaflet-control {
-		-webkit-print-color-adjust: exact;
-		color-adjust: exact;
-		}
-	}

searx/static/themes/simple/src/js/main/search.js

@@ -86,7 +86,7 @@
 
       qinput.addEventListener('focus', placeCursorAtEndOnce, false);
 
-      if (!isMobile) {
+      if (!isMobile && document.querySelector('.index_endpoint')) {
         qinput.focus();
       }
     }