[MediaWiki-commits] [Gerrit] mediawiki...Interwiki[master]: Load 'ext.interwiki.specialpage' as style module

2018-01-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374113 )

Change subject: Load 'ext.interwiki.specialpage' as style module
..


Load 'ext.interwiki.specialpage' as style module

This avoids a FOUC on loading.

For overwriting the wikitable styles a higher specificity is needed to
not depend on the order of loading.

The dependency to module 'jquery.makeCollapsible' is not necessary
because this module is loaded automatically.

Change-Id: Icc1ec927a89df5cf8c847ab5cb77d81f2651be49
---
M Interwiki.css
M Interwiki_body.php
M extension.json
3 files changed, 5 insertions(+), 6 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Interwiki.css b/Interwiki.css
index e0d4625..eb7a53a 100644
--- a/Interwiki.css
+++ b/Interwiki.css
@@ -43,7 +43,9 @@
 .mw-interwiki-legend .mw-collapsible-toggle {
font-weight: normal;
 }
-table.mw-interwiki-legend {
+
+/* Selector with higher specifity than wikitable */
+table.wikitable.mw-interwiki-legend {
margin-top: 2em;
 }
 
diff --git a/Interwiki_body.php b/Interwiki_body.php
index c6c37ca..ca18a1c 100644
--- a/Interwiki_body.php
+++ b/Interwiki_body.php
@@ -42,7 +42,7 @@
$out = $this->getOutput();
$request = $this->getRequest();
 
-   $out->addModules( 'ext.interwiki.specialpage' );
+   $out->addModuleStyles( 'ext.interwiki.specialpage' );
 
$action = $par ?: $request->getVal( 'action', $par );
$return = $this->getPageTitle();
diff --git a/extension.json b/extension.json
index e409d9f..21b5911 100644
--- a/extension.json
+++ b/extension.json
@@ -39,10 +39,7 @@
},
"ResourceModules": {
"ext.interwiki.specialpage": {
-   "styles": "Interwiki.css",
-   "dependencies": [
-   "jquery.makeCollapsible"
-   ]
+   "styles": "Interwiki.css"
}
},
"ResourceFileModulePaths": {

-- 
To view, visit https://gerrit.wikimedia.org/r/374113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icc1ec927a89df5cf8c847ab5cb77d81f2651be49
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Interwiki[master]: Load 'ext.interwiki.specialpage' as style module

2017-08-27 Thread Fomafix (Code Review) 
Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374113 )

Change subject: Load 'ext.interwiki.specialpage' as style module
..

Load 'ext.interwiki.specialpage' as style module

This avoids a FOUC on loading.

For overwriting the wikitable styles a higher specificity is needed to
not depend on the order of loading.

The dependency to module 'jquery.makeCollapsible' is not necessary
because this module is loaded automatically.

Change-Id: Icc1ec927a89df5cf8c847ab5cb77d81f2651be49
---
M Interwiki.css
M Interwiki_body.php
M extension.json
3 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Interwiki 
refs/changes/13/374113/1

diff --git a/Interwiki.css b/Interwiki.css
index e0d4625..eb7a53a 100644
--- a/Interwiki.css
+++ b/Interwiki.css
@@ -43,7 +43,9 @@
 .mw-interwiki-legend .mw-collapsible-toggle {
font-weight: normal;
 }
-table.mw-interwiki-legend {
+
+/* Selector with higher specifity than wikitable */
+table.wikitable.mw-interwiki-legend {
margin-top: 2em;
 }
 
diff --git a/Interwiki_body.php b/Interwiki_body.php
index a8db516..5176987 100644
--- a/Interwiki_body.php
+++ b/Interwiki_body.php
@@ -42,7 +42,7 @@
$out = $this->getOutput();
$request = $this->getRequest();
 
-   $out->addModules( 'ext.interwiki.specialpage' );
+   $out->addModuleStyles( 'ext.interwiki.specialpage' );
 
$action = $par ?: $request->getVal( 'action', $par );
$return = $this->getPageTitle();
diff --git a/extension.json b/extension.json
index afc108e..bb974bd 100644
--- a/extension.json
+++ b/extension.json
@@ -39,10 +39,7 @@
},
"ResourceModules": {
"ext.interwiki.specialpage": {
-   "styles": "Interwiki.css",
-   "dependencies": [
-   "jquery.makeCollapsible"
-   ]
+   "styles": "Interwiki.css"
}
},
"ResourceFileModulePaths": {

-- 
To view, visit https://gerrit.wikimedia.org/r/374113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc1ec927a89df5cf8c847ab5cb77d81f2651be49
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits