From: jenkins-bot Date: Mon, 28 Sep 2015 06:42:46 +0000 (+0000) Subject: Merge "Move italic redirect link styles to modules" X-Git-Tag: 1.31.0-rc.0~9743 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=1f0857f26f400e484041ba4c55eba6ddd934c5fe;hp=-c;p=lhc%2Fweb%2Fwiklou.git Merge "Move italic redirect link styles to modules" --- 1f0857f26f400e484041ba4c55eba6ddd934c5fe diff --combined includes/specials/SpecialEditWatchlist.php index 5f87cf4a99,a1ef3c8ee4..64a93a0373 --- a/includes/specials/SpecialEditWatchlist.php +++ b/includes/specials/SpecialEditWatchlist.php @@@ -71,6 -71,7 +71,7 @@@ class SpecialEditWatchlist extends Unli $this->outputHeader(); $this->outputSubtitle(); + $out->addModuleStyles( 'mediawiki.special' ); # B/C: $mode used to be waaay down the parameter list, and the first parameter # was $wgUser @@@ -403,7 -404,7 +404,7 @@@ */ private function cleanupWatchlist() { if ( !count( $this->badItems ) ) { - return; //nothing to do + return; // nothing to do } $dbw = wfGetDB( DB_MASTER ); diff --combined resources/src/mediawiki.legacy/shared.css index 961c02b20b,2987224769..dd370518ec --- a/resources/src/mediawiki.legacy/shared.css +++ b/resources/src/mediawiki.legacy/shared.css @@@ -116,16 -116,6 +116,6 @@@ abbr[title] unicode-bidi: isolate; } - /** - * Links to redirects appear italicized on [[Special:AllPages]], [[Special:PrefixIndex]], - * [[Special:Watchlist/edit]] and in category listings. - */ - .allpagesredirect, - .redirect-in-category, - .watchlistredir { - font-style: italic; - } - /* Comment portions of RC entries */ span.comment { font-style: italic; @@@ -206,6 -196,18 +196,6 @@@ td.mw-label vertical-align: middle; } -.prefsection td.mw-label { - width: 20%; -} - -.prefsection table { - width: 100%; -} - -.prefsection table.mw-htmlform-matrix { - width: auto; -} - td.mw-submit { white-space: nowrap; } @@@ -382,6 -384,21 +372,6 @@@ a.new color: #BA0000; } -/* feed links */ -/* To be removed before 1.26 release, moved to mediawiki.feedlink module */ -a.feedlink { - /* SVG support using a transparent gradient to guarantee cross-browser - * compatibility (browsers able to understand gradient syntax support also SVG). - * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */ - background-image: url(../mediawiki/images/feed-icon.png); - background-image: -webkit-linear-gradient(transparent, transparent), url(../mediawiki/images/feed-icon.svg); - background-image: linear-gradient(transparent, transparent), url(../mediawiki/images/feed-icon.svg); - background-position: center left; - background-repeat: no-repeat; - background-size: 12px 12px; - padding-left: 16px; -} - /* Plainlinks - this can be used to switch * off special external link styling */ .plainlinks a.external { diff --combined resources/src/mediawiki.special/mediawiki.special.css index a13ec3cc40,0a8363b099..60544d3248 --- a/resources/src/mediawiki.special/mediawiki.special.css +++ b/resources/src/mediawiki.special/mediawiki.special.css @@@ -39,6 -39,9 +39,9 @@@ ul.mw-allpages-chunk li vertical-align: top; width: 31%; } + .allpagesredirect { + font-style: italic; + } /* Special:BlockList */ table.mw-blocklist span.mw-usertoollinks, @@@ -52,6 -55,11 +55,11 @@@ span.mw-blocklist-actions font-weight: bold; } + /* Special:EditWatchlist */ + .watchlistredir { + font-style: italic; + } + /* Special:EmailUser */ td#mw-emailuser-sender, td#mw-emailuser-recipient { @@@ -84,10 -92,13 +92,10 @@@ td#mw-prefixindex-nav-form font-weight: bold; } -.mw-specialpages-table { - margin-top: -1em; - margin-bottom: 1em; -} - -.mw-specialpages-table td { - vertical-align: top; +.mw-specialpages-list { + -webkit-columns: 16em 2; + -moz-columns: 16em 2; + columns: 16em 2; } /* Special:Statistics */