Merge "Correctly fall back to $wgLogos['icon'] when not using timeless' speshul junk"

includes/TimelessTemplate.php

@@ -523,7 +523,7 @@ class TimelessTemplate extends BaseTemplate {
 		}
 		if ( $part !== 'text' ) {
 			$logoImage = $this->getLogoImage( $config->get( 'TimelessLogo' ) );
-			if ( $logoImage === null && isset( $logos['icon'] ) ) {
+			if ( $logoImage === false && isset( $logos['icon'] ) ) {
 				$logoSrc = $logos['icon'];
 				$logoImage = Html::element( 'img', [
 					'src' => $logoSrc,

resources/screen-desktop.less

@@ -187,6 +187,12 @@ div.mw-notification-area {
 
 	&.timeless-logo {
 		background-image: none;
+
+		img {
+			max-width: 156px;
+			height: auto;
+			margin: 0.75em 0 0.5em;
+		}
 	}
 }