Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197107
Change subject: Move style for TOC hiding to separate module
......................................................................
Move style for TOC hiding to separate module
* Load module 'mediawiki.toc' on 'position' => 'top' to avoid flickering.
* Add dependency from 'mediawiki.action.edit.preview' to
'mediawiki.toc' to avoid flickering on preview.
Change-Id: Ib7c81e9433e7e3976e40e407f63fc8e924957faa
---
M resources/Resources.php
M resources/src/mediawiki.legacy/commonPrint.css
M resources/src/mediawiki.legacy/oldshared.css
M resources/src/mediawiki.legacy/shared.css
M resources/src/mediawiki.skinning/content.css
A resources/src/mediawiki/mediawiki.toc.css
A resources/src/mediawiki/mediawiki.toc.print.css
7 files changed, 25 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/197107/1
diff --git a/resources/Resources.php b/resources/Resources.php
index a158af7..9268179 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -986,8 +986,17 @@
),
'mediawiki.toc' => array(
'scripts' => 'resources/src/mediawiki/mediawiki.toc.js',
+ 'skinStyles' => array(
+ 'default' => array(
+ 'resources/src/mediawiki/mediawiki.toc.css' =>
+ array( 'media' => 'screen'),
+
'resources/src/mediawiki/mediawiki.toc.print.css' =>
+ array( 'media' => 'print' ),
+ ),
+ ),
'dependencies' => 'jquery.cookie',
'messages' => array( 'showtoc', 'hidetoc' ),
+ 'position' => 'top',
'targets' => array( 'desktop', 'mobile' ),
),
'mediawiki.Uri' => array(
@@ -1068,6 +1077,7 @@
'mediawiki.api',
'mediawiki.action.history.diff',
'mediawiki.util',
+ 'mediawiki.toc', // preload to avoid flickering
'mediawiki.jqueryMsg',
),
'messages' => array(
diff --git a/resources/src/mediawiki.legacy/commonPrint.css
b/resources/src/mediawiki.legacy/commonPrint.css
index 9a8d391..096cd23 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -19,8 +19,6 @@
#colophon,
.mw-editsection,
.mw-editsection-like,
-.toctoggle,
-#toc.tochidden,
div#f-poweredbyico,
div#f-copyrightico,
li#about,
diff --git a/resources/src/mediawiki.legacy/oldshared.css
b/resources/src/mediawiki.legacy/oldshared.css
index c2bd5a7..b8f8dd5 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -213,11 +213,6 @@
margin: 0 0 0 2em;
}
-#toc .toctoggle,
-.toc .toctoggle {
- font-size: 94%;
-}
-
.error {
color: red;
font-size: larger;
diff --git a/resources/src/mediawiki.legacy/shared.css
b/resources/src/mediawiki.legacy/shared.css
index 467714e..64084a9 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -1123,8 +1123,6 @@
}
.mw-editsection,
-.toctoggle,
-.tochidden,
#jump-to-nav {
-moz-user-select: none;
-webkit-user-select: none;
diff --git a/resources/src/mediawiki.skinning/content.css
b/resources/src/mediawiki.skinning/content.css
index 7dd5ee7..f412fc3 100644
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -83,11 +83,6 @@
margin: 0 0 0 2em;
}
-#toc .toctoggle,
-.toc .toctoggle {
- font-size: 94%;
-}
-
/* Warning */
.mw-warning {
margin-left: 50px;
diff --git a/resources/src/mediawiki/mediawiki.toc.css
b/resources/src/mediawiki/mediawiki.toc.css
new file mode 100644
index 0000000..835a451
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.toc.css
@@ -0,0 +1,11 @@
+.tochidden,
+.toctoggle {
+ -moz-user-select: none;
+ -webkit-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+
+.toctoggle {
+ font-size: 94%;
+}
diff --git a/resources/src/mediawiki/mediawiki.toc.print.css
b/resources/src/mediawiki/mediawiki.toc.print.css
new file mode 100644
index 0000000..da2c08f
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.toc.print.css
@@ -0,0 +1,4 @@
+#toc.tochidden,
+.toctoggle {
+ display: none;
+}
--
To view, visit https://gerrit.wikimedia.org/r/197107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7c81e9433e7e3976e40e407f63fc8e924957faa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
