Merge "Fix "UTPage" creation in tests"

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index cea012a..a3c427e 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -135,7 +135,8 @@ return array(
        'skins.vector.styles' => array(
                // Used in the web installer. Test it after modifying this definition!
                'styles' => array(
-                       'vector/styles.less',
+                       'vector/screen.less' => array( 'media' => 'screen' ),
+                       'vector/screen-hd.less' => array( 'media' => 'screen and (min-width: 982px)' ),
                ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
@@ -691,11 +692,12 @@ return array(
                        'pt-br' => 'resources/lib/moment/lang/pt-br.js',
                        'pt' => 'resources/lib/moment/lang/pt.js',
                        'ro' => 'resources/lib/moment/lang/ro.js',
-                       'rs' => 'resources/lib/moment/lang/rs.js',
                        'ru' => 'resources/lib/moment/lang/ru.js',
                        'sk' => 'resources/lib/moment/lang/sk.js',
                        'sl' => 'resources/lib/moment/lang/sl.js',
                        'sq' => 'resources/lib/moment/lang/sq.js',
+                       'sr-el' => 'resources/lib/moment/lang/sr.js',
+                       'sr-ec' => 'resources/lib/moment/lang/sr-cyr.js',
                        'sv' => 'resources/lib/moment/lang/sv.js',
                        'ta' => 'resources/lib/moment/lang/ta.js',
                        'th' => 'resources/lib/moment/lang/th.js',
@@ -705,7 +707,7 @@ return array(
                        'tzm' => 'resources/lib/moment/lang/tzm.js',
                        'uk' => 'resources/lib/moment/lang/uk.js',
                        'uz' => 'resources/lib/moment/lang/uz.js',
-                       'vn' => 'resources/lib/moment/lang/vn.js',
+                       'vi' => 'resources/lib/moment/lang/vi.js',
                        'zh-cn' => 'resources/lib/moment/lang/zh-cn.js',
                        'zh-tw' => 'resources/lib/moment/lang/zh-tw.js',
                ),
@@ -898,7 +900,6 @@ return array(
                        'jquery.client',
                        'jquery.mwExtension',
                        'mediawiki.notify',
-                       'mediawiki.toc',
                ),
                'position' => 'top', // For $wgPreloadJavaScriptMwUtil
                'targets' => array( 'desktop', 'mobile' ),