From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 25 Sep 2017 19:49:56 +0000 (+0000)
Subject: Merge "Add print styles for gallery mode packed-hover"
X-Git-Tag: 1.31.0-rc.0~1964
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=911de590d5517d08ee00c33c980d35b9c6f501c0;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Add print styles for gallery mode packed-hover"
---

911de590d5517d08ee00c33c980d35b9c6f501c0
diff --combined resources/Resources.php
index 014e6a16c3,a27bb98ba5..f9590ec8b2
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@@ -1091,9 -1091,6 +1091,9 @@@ return 
  		'scripts' => [
  			'resources/src/mediawiki/htmlform/htmlform.Checker.js',
  		],
 +		'dependencies' => [
 +			'jquery.throttle-debounce',
 +		],
  		'targets' => [ 'desktop', 'mobile' ],
  	],
  	'mediawiki.htmlform.ooui' => [
@@@ -1451,7 -1448,6 +1451,7 @@@
  			'jquery.textSelection',
  			'mediawiki.api',
  			'mediawiki.diff.styles',
 +			'mediawiki.language',
  			'mediawiki.util',
  			'mediawiki.jqueryMsg',
  			'oojs-ui-core',
@@@ -1653,8 -1649,8 +1653,8 @@@
  	],
  	'mediawiki.page.gallery.styles' => [
  		'styles' => [
- 			'resources/src/mediawiki/page/gallery.print.css' => [ 'media' => 'print' ],
  			'resources/src/mediawiki/page/gallery.css',
+ 			'resources/src/mediawiki/page/gallery.print.css' => [ 'media' => 'print' ],
  		],
  		'targets' => [ 'desktop', 'mobile' ],
  	],
@@@ -1776,7 -1772,6 +1776,7 @@@
  			'resources/src/mediawiki.rcfilters/mw.rcfilters.UriProcessor.js',
  		],
  		'dependencies' => [
 +			'jquery.byteLength',
  			'oojs',
  			'mediawiki.api',
  			'mediawiki.api.options',
@@@ -1917,7 -1912,7 +1917,7 @@@
  			'quotation-marks',
  		],
  		'dependencies' => [
 -			'oojs-ui',
 +			'oojs-ui-widgets',
  			'jquery.makeCollapsible',
  			'mediawiki.language',
  			'mediawiki.user',
@@@ -1927,6 -1922,7 +1927,6 @@@
  			'oojs-ui.styles.icons-editing-core',
  			'oojs-ui.styles.icons-editing-styling',
  			'oojs-ui.styles.icons-interactions',
 -			'oojs-ui.styles.icons-content',
  			'oojs-ui.styles.icons-layout',
  			'oojs-ui.styles.icons-media',
  		],
@@@ -2092,12 -2088,7 +2092,12 @@@
  		'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
  	],
  	'mediawiki.special.preferences' => [
 -		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.preferences.js',
 +		'scripts' => [
 +			'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
 +			'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
 +			'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js',
 +			'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
 +		],
  		'messages' => [
  			'prefs-tabs-navigation-hint',
  			'prefswarning-warning',