jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/371603 )
Change subject: Fix previous patch, better skinsplash ...................................................................... Fix previous patch, better skinsplash ...feck arse. Change-Id: I80d4bd860978d24bb3e69ff04e01f48f890f4827 --- M Splash.skin.php M skin.json 2 files changed, 15 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Isarra: Looks good to me, approved diff --git a/Splash.skin.php b/Splash.skin.php index 38b4c0d..88985e9 100644 --- a/Splash.skin.php +++ b/Splash.skin.php @@ -9,11 +9,12 @@ $template = 'SplashTemplate', $useHeadElement = true; /** - * @param $out OutputPage + * @param OutputPage $out */ - function setupSkinUserCss( OutputPage $out ) { - global $wgFontCSSLocation; - parent::setupSkinUserCss( $out ); + public function initPage( OutputPage $out ) { + parent::initPage( $out ); + + $out->addMeta( 'viewport', 'width=device-width, initial-scale=1, maximum-scale=1' ); # Add css/js $out->addModuleStyles( array ( @@ -22,4 +23,13 @@ ) ); $out->addModuleScripts( 'skins.splash' ); } + + /** + * Add CSS via ResourceLoader + * @param $out OutputPage + */ + function setupSkinUserCss( OutputPage $out ) { + global $wgFontCSSLocation; + parent::setupSkinUserCss( $out ); + } } diff --git a/skin.json b/skin.json index f527a19..c16e7d6 100644 --- a/skin.json +++ b/skin.json @@ -18,7 +18,7 @@ }, "AutoloadClasses": { "SkinSplash": "Splash.skin.php", - "SplashTemplate": "Splash.skin.php" + "SplashTemplate": "SplashTemplate.php" }, "ResourceFileModulePaths": { "localBasePath": "", -- To view, visit https://gerrit.wikimedia.org/r/371603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80d4bd860978d24bb3e69ff04e01f48f890f4827 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Splash Gerrit-Branch: master Gerrit-Owner: Isarra <zhoris...@gmail.com> Gerrit-Reviewer: Isarra <zhoris...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits