| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -108,7 +108,8 @@ |
| 109 | 109 | */ |
| 110 | 110 | function setupSkinUserCss( OutputPage $out ){ |
| 111 | 111 | $out->addModuleStyles( 'mediawiki.legacy.shared' ); |
| 112 | | - $out->addModuleStyles( 'mediawiki.legacy.commonPrint' ); |
| | 112 | + // ResourceLoader does not support CSS media types yet, so we must include this on it's own the old way |
| | 113 | + $out->addStyle( 'common/commonPrint.css', 'print' ); |
| 113 | 114 | } |
| 114 | 115 | |
| 115 | 116 | /** |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -723,8 +723,8 @@ |
| 724 | 724 | * @param $out OutputPage |
| 725 | 725 | */ |
| 726 | 726 | function setupSkinUserCss( OutputPage $out ) { |
| 727 | | - // This includes the shared.js and oldshared.js files from skins/common/ |
| 728 | 727 | $out->addModuleStyles( 'mediawiki.legacy.shared' ); |
| | 728 | + $out->addModuleStyles( 'mediawiki.legacy.oldshared' ); |
| 729 | 729 | // TODO: Figure out how to best integrate this stuff into ResourceLoader |
| 730 | 730 | $out->addStyle( $this->getStylesheet() ); |
| 731 | 731 | $out->addStyle( 'common/common_rtl.css', '', '', 'rtl' ); |
| Index: trunk/phase3/resources/Resources.php |
| — | — | @@ -350,8 +350,11 @@ |
| 351 | 351 | 'dependencies' => 'mediawiki.legacy.wikibits', |
| 352 | 352 | ) ), |
| 353 | 353 | 'mediawiki.legacy.shared' => new ResourceLoaderFileModule( array( |
| 354 | | - 'styles' => array( 'skins/common/shared.css', 'skins/common/oldshared.css' ), |
| | 354 | + 'styles' => 'skins/common/shared.css', |
| 355 | 355 | ) ), |
| | 356 | + 'mediawiki.legacy.oldshared' => new ResourceLoaderFileModule( array( |
| | 357 | + 'styles' => 'skins/common/oldshared.css', |
| | 358 | + ) ), |
| 356 | 359 | 'mediawiki.legacy.upload' => new ResourceLoaderFileModule( array( |
| 357 | 360 | 'scripts' => 'skins/common/upload.js', |
| 358 | 361 | 'dependencies' => 'mediawiki.legacy.wikibits', |