r91734: Do the same for search.css and remove module from resources.php

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index d790287..9797d24 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -407,7 +407,6 @@ class SpecialSearch extends SpecialPage {
                        $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'searchresults-title', $term ) ) );
                }
                // add javascript specific to special:search
-               $wgOut->addModules( 'mediawiki.legacy.search' );
                $wgOut->addModules( 'mediawiki.special.search' );
        }
 

diff --git a/resources/Resources.php b/resources/Resources.php
index 3d3ca4e..5aed304 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -535,6 +535,7 @@ return array(
        ),
        'mediawiki.special.search' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
+               'styles'  => 'resources/mediawiki.special/mediawiki.special.search.css',
        ),
        'mediawiki.special.block' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.block.js',
@@ -669,13 +670,6 @@ return array(
                        'jquery.byteLimit',
                ),
        ),
-       'mediawiki.legacy.search' => array(
-               'scripts' => 'common/search.js',
-               'remoteBasePath' => $GLOBALS['wgStylePath'],
-               'localBasePath' => $GLOBALS['wgStyleDirectory'],
-               'styles' => 'common/search.css',
-               'dependencies' => 'mediawiki.legacy.wikibits',
-       ),
        'mediawiki.legacy.shared' => array(
                'styles' => array( 'common/shared.css' => array( 'media' => 'screen' ) ),
                'remoteBasePath' => $GLOBALS['wgStylePath'],

diff --git a/resources/mediawiki.special/mediawiki.special.search.css b/resources/mediawiki.special/mediawiki.special.search.css
new file mode 100644 (file)
index 0000000..89d55b0
--- /dev/null
+++ b/resources/mediawiki.special/mediawiki.special.search.css
@@ -0,0 +1,14 @@
+/**
+ * Fixes sister projects box moving down the extract 
+ * of the first result (bug #16886).
+ * It only happens when the window is small and 
+ * This changes slightly the layout for big screens 
+ * where there was space for the extracts and the 
+ * sister projects and thus it showed like in any 
+ * other browser.
+ *
+ * This will only affect IE 7 and lower
+ */
+.searchresult {
+       display: inline !ie;
+}

diff --git a/skins/common/search.css b/skins/common/search.css
deleted file mode 100644 (file)
index 89d55b0..0000000
--- a/skins/common/search.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Fixes sister projects box moving down the extract 
- * of the first result (bug #16886).
- * It only happens when the window is small and 
- * This changes slightly the layout for big screens 
- * where there was space for the extracts and the 
- * sister projects and thus it showed like in any 
- * other browser.
- *
- * This will only affect IE 7 and lower
- */
-.searchresult {
-       display: inline !ie;
-}