Append class to body always (#525)

* Append class always

The behavior was broken while f1c06ea

* Revert "Use logo skin feature (#524)"

This reverts commit 52336af.

includes/FemiwikiResourceLoaderSkinModule.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace MediaWiki\Skins\Femiwiki;
+
+use CSSMin;
+use ResourceLoaderContext;
+use ResourceLoaderSkinModule;
+
+class FemiwikiResourceLoaderSkinModule extends ResourceLoaderSkinModule {
+	/**
+	 * @param ResourceLoaderContext $context
+	 * @return array
+	 */
+	protected function getLessVars( ResourceLoaderContext $context ) {
+		$lessVars = parent::getLessVars( $context );
+		$logos = $this->getConfig()->get( 'Logos' );
+
+		# icon has high priority for FemiwikiSkin's backward compatibility.
+		# This behavior will be removed in the next major version up(v2).
+		$symbol = $logos[ 'icon' ] ?? $logos[ 'svg' ] ?? null;
+		if ( $symbol !== null ) {
+			$lessVars[ 'symbol-enabled'] = true;
+			$lessVars[ 'symbol-url' ] = CSSMin::buildUrlValue( $symbol );
+		} else {
+			$lessVars[ 'symbol-enabled'] = false;
+		}
+
+		return $lessVars;
+	}
+}

includes/SmallElementsHooks.php

@@ -49,7 +49,8 @@ public function onOutputPageBodyAttributes( $out, $sk, &$bodyAttrs ): void {
 			( !$registered && $config->get( Constants::CONFIG_KEY_SMALL_ELEMENTS_FOR_ANONYMOUS_USER ) )
 			|| ( $registered && !$userOptionsLookup->getBoolOption( $user, Constants::PREF_KEY_LARGER_ELEMENTS ) )
 			) {
-			$bodyAttrs['class'] ??= ' fw-legacy-small-elements';
+			$bodyAttrs['class'] ??= '';
+			$bodyAttrs['class'] .= ' fw-legacy-small-elements';
 		}
 	}
 }

resources/skins.femiwiki/interface-gnb.less

@@ -27,7 +27,12 @@
       background-repeat: no-repeat;
       @width: @height;
       width: @width;
-      background-size: @height @height;
+
+      & when( @symbol-enabled = 1 ) {
+        /* @embed */
+        background-image: @symbol-url;
+        background-size: @height @height;
+      }
 
       & when( @logo-enabled = 1 ) {
         @media (min-width: @width-breakpoint-tablet) {

skin.json

@@ -51,12 +51,11 @@
   },
   "ResourceModules": {
     "skins.femiwiki": {
-      "class": "ResourceLoaderSkinModule",
+      "class": "MediaWiki\\Skins\\Femiwiki\\FemiwikiResourceLoaderSkinModule",
       "features": {
         "content-media": true,
         "toc": false,
-        "normalize": true,
-        "logo": true
+        "normalize": true
       },
       "targets": ["desktop", "mobile"],
       "position": "top",