| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -30,9 +30,6 @@ |
| 31 | 31 | |
| 32 | 32 | parent::initPage( $out ); |
| 33 | 33 | |
| 34 | | - // Append skin-specific styles |
| 35 | | - $out->addStyle( 'vector/main-rtl.css', 'screen', '', 'rtl' ); |
| 36 | | - $out->addStyle( 'vector/main-ltr.css', 'screen', '', 'ltr' ); |
| 37 | 34 | // Append CSS which includes IE only behavior fixes for hover support - |
| 38 | 35 | // this is better than including this in a CSS fille since it doesn't |
| 39 | 36 | // wait for the CSS file to load before fetching the HTC file. |
| — | — | @@ -41,14 +38,32 @@ |
| 42 | 39 | $wgStylePath . |
| 43 | 40 | '/vector/csshover.htc")}</style><![endif]-->' |
| 44 | 41 | ); |
| | 42 | + } |
| | 43 | + |
| | 44 | + /** |
| | 45 | + * Load skin and user css files in the correct order |
| | 46 | + * fixes bug 22916 |
| | 47 | + * @param object $out OutputPage object |
| | 48 | + */ |
| | 49 | + |
| | 50 | + function setupSkinUserCss( OutputPage $out ){ |
| | 51 | + global $wgStylePath, $wgVectorExtraStyles; |
| | 52 | + |
| | 53 | + parent::setupSkinUserCss( $out ); |
| | 54 | + |
| | 55 | + // Append skin-specific styles |
| | 56 | + $out->addStyle( 'origins/main-rtl.css', 'screen', '', 'rtl' ); |
| | 57 | + $out->addStyle( 'origins/main-ltr.css', 'screen', '', 'ltr' ); |
| | 58 | + |
| 45 | 59 | // Add extra stylesheets |
| 46 | 60 | // THIS IS ONLY USEFUL FOR EXPERIMENTING WITH DIFFERNT STYLE OPTIONS! THIS WILL BE REMOVED IN THE NEAR FUTURE. |
| 47 | 61 | if ( is_array( $wgVectorExtraStyles ) ) { |
| 48 | 62 | foreach ( $wgVectorExtraStyles as $style ) { |
| 49 | | - $out->addStyle( 'vector/' . $style, 'screen' ); |
| | 63 | + $out->addStyle( 'origins/' . $style, 'screen' ); |
| 50 | 64 | } |
| 51 | 65 | } |
| 52 | 66 | } |
| | 67 | + |
| 53 | 68 | /** |
| 54 | 69 | * Builds a structured array of links used for tabs and menus |
| 55 | 70 | * @return array |