dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Sort 'MediaWiki' resources definitions alphabetically"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
16ec324
..
31714a6
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-1050,7
+1050,10
@@
return array(
'size-gigabytes',
'largefileserver',
),
'size-gigabytes',
'largefileserver',
),
- 'dependencies' => array( 'mediawiki.libs.jpegmeta', 'mediawiki.util' ),
+ 'dependencies' => array(
+ 'mediawiki.libs.jpegmeta',
+ 'mediawiki.util',
+ ),
),
'mediawiki.special.userlogin' => array(
'styles' => array(
),
'mediawiki.special.userlogin' => array(
'styles' => array(
@@
-1131,7
+1134,6
@@
return array(
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
'dependencies' => array(
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
'dependencies' => array(
- 'mediawiki.legacy.wikibits',
'jquery.byteLimit',
),
'position' => 'top',
'jquery.byteLimit',
),
'position' => 'top',
@@
-1152,9
+1154,9
@@
return array(
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
'dependencies' => array(
'remoteBasePath' => $GLOBALS['wgStylePath'],
'localBasePath' => $GLOBALS['wgStyleDirectory'],
'dependencies' => array(
+ 'jquery.spinner',
'mediawiki.api',
'mediawiki.Title',
'mediawiki.api',
'mediawiki.Title',
- 'mediawiki.legacy.wikibits',
'mediawiki.util',
),
),
'mediawiki.util',
),
),
@@
-1169,8
+1171,8
@@
return array(
),
'mediawiki.ui' => array(
'skinStyles' => array(
),
'mediawiki.ui' => array(
'skinStyles' => array(
- 'default' => 'resources/mediawiki.ui/
mediawiki.ui.default.c
ss',
- 'vector' => 'resources/mediawiki.ui/
mediawiki.ui.vector.c
ss',
+ 'default' => 'resources/mediawiki.ui/
default.le
ss',
+ 'vector' => 'resources/mediawiki.ui/
vector.le
ss',
),
'position' => 'top',
),
),
'position' => 'top',
),