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 "Remove temporary rollback confirmation toggle"
[lhc/web/wiklou.git]
/
resources
/
Resources.php
diff --git
a/resources/Resources.php
b/resources/Resources.php
index
aa6e755
..
ec44a83
100644
(file)
--- a/
resources/Resources.php
+++ b/
resources/Resources.php
@@
-294,7
+294,7
@@
return [
],
'jquery.spinner' => [
'scripts' => 'resources/src/jquery.spinner/spinner.js',
],
'jquery.spinner' => [
'scripts' => 'resources/src/jquery.spinner/spinner.js',
- 'styles' => 'resources/src/jquery.spinner/spinner.
c
ss',
+ 'styles' => 'resources/src/jquery.spinner/spinner.
le
ss',
'targets' => [ 'desktop', 'mobile' ],
],
'jquery.jStorage' => [
'targets' => [ 'desktop', 'mobile' ],
],
'jquery.jStorage' => [
@@
-1453,7
+1453,9
@@
return [
'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',
],
'mediawiki.action.history.styles' => [
'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',
],
'mediawiki.action.history.styles' => [
- 'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
+ 'skinStyles' => [
+ 'default' => 'resources/src/mediawiki.action/mediawiki.action.history.styles.css',
+ ],
],
'mediawiki.action.view.dblClickEdit' => [
'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
],
'mediawiki.action.view.dblClickEdit' => [
'scripts' => 'resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js',
@@
-1763,17
+1765,15
@@
return [
'removedwatchtext-talk',
],
],
'removedwatchtext-talk',
],
],
- 'mediawiki.page.rollback' => [
- 'scripts' => 'resources/src/mediawiki.
page.rollback
.js',
+ 'mediawiki.page.rollback
.confirmation
' => [
+ 'scripts' => 'resources/src/mediawiki.
rollback.confirmation
.js',
'dependencies' => [
'dependencies' => [
- 'mediawiki.api',
- 'mediawiki.notify',
- 'mediawiki.util',
- 'jquery.spinner',
+ 'jquery.confirmable'
],
'messages' => [
],
'messages' => [
- 'rollbackfailed',
- 'actioncomplete',
+ 'rollback-confirmation-confirm',
+ 'rollback-confirmation-yes',
+ 'rollback-confirmation-no',
],
],
'mediawiki.page.image.pagination' => [
],
],
'mediawiki.page.image.pagination' => [
@@
-2012,8
+2012,8
@@
return [
'parentheses-end',
'pipe-separator'
],
'parentheses-end',
'pipe-separator'
],
- 'styles' => [
- 'resources/src/mediawiki.interface.helpers.styles.less',
+ 's
kinS
tyles' => [
+ '
default' => '
resources/src/mediawiki.interface.helpers.styles.less',
],
'targets' => [
'desktop', 'mobile'
],
'targets' => [
'desktop', 'mobile'
@@
-2135,7
+2135,10
@@
return [
],
'mediawiki.special.changeslist' => [
'styles' => [
],
'mediawiki.special.changeslist' => [
'styles' => [
- 'resources/src/mediawiki.special.changeslist.less',
+ 'resources/src/mediawiki.special.changeslist/changeslist.less'
+ ],
+ 'skinStyles' => [
+ 'default' => 'resources/src/mediawiki.special.changeslist/default.less',
],
'targets' => [ 'desktop', 'mobile' ],
],
],
'targets' => [ 'desktop', 'mobile' ],
],