TOC: Move JavaScript-related styles to the same module

This change moves the rules for the CSS classes that only
get used by JavaScript into the same module 'mediawiki.toc'.
This module already gets loaded via JavaScript.

This way, the styles are only loaded when they are needed.

Cached HTML pages already contain the module 'mediawiki.toc'
so there is no problem on deployment.

Change-Id: Ib7c81e9433e7e3976e40e407f63fc8e924957faa

diff --git a/resources/Resources.php b/resources/Resources.php
index aba5ce8..4657a6a 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1270,6 +1270,12 @@ return array(
        ),
        'mediawiki.toc' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.toc.js',
+               'styles' => array(
+                       'resources/src/mediawiki/mediawiki.toc.css'
+                               => array( 'media' => 'screen' ),
+                       'resources/src/mediawiki/mediawiki.toc.print.css'
+                               => array( 'media' => 'print' ),
+               ),
                'dependencies' => 'mediawiki.cookie',
                'messages' => array( 'showtoc', 'hidetoc' ),
                'targets' => array( 'desktop', 'mobile' ),

diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css
index ce565e0..453d928 100644 (file)
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -18,8 +18,6 @@ div.top,
 div#column-one,
 .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 66161ed..77391d7 100644 (file)
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -212,11 +212,6 @@ table.toc td {
        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 75a091c..daebac1 100644 (file)
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -872,8 +872,6 @@ table.floatleft {
 }
 
 .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 4399f3e..b069e50 100644 (file)
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -82,11 +82,6 @@ table.toc td {
        margin: 0 0 0 2em;
 }
 
-#toc .toctoggle,
-.toc .toctoggle {
-       font-size: 94%;
-}
-
 /* Separate columns for tocnumber and toctext */
 /* Ignored by IE7 and lower */
 .tocnumber,

diff --git a/resources/src/mediawiki/mediawiki.toc.css b/resources/src/mediawiki/mediawiki.toc.css
new file mode 100644 (file)
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 (file)
index 0000000..da2c08f
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.toc.print.css
@@ -0,0 +1,4 @@
+#toc.tochidden,
+.toctoggle {
+       display: none;
+}