Jack Phoenix has uploaded a new change for review. https://gerrit.wikimedia.org/r/176615
Change subject: Version 3.1 -- fixed for MW 1.24 ...................................................................... Version 3.1 -- fixed for MW 1.24 Change-Id: I09d28350a187598c450becb0e38e9ad504025f20 --- M Nimbus.php M Nimbus.skin.php M nimbus/Nimbus.css 3 files changed, 16 insertions(+), 78 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus refs/changes/15/176615/1 diff --git a/Nimbus.php b/Nimbus.php index d7fa2a2..37f0f6e 100644 --- a/Nimbus.php +++ b/Nimbus.php @@ -10,7 +10,7 @@ * @author Jack Phoenix <[email protected]> * @copyright Copyright © 2008-2014 Aaron Wright, David Pean, Inez Korczyński, Jack Phoenix * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later - * @date 25 September 2014 + * @date 30 November 2014 * * To install place the Nimbus folder (the folder containing this file!) into * skins/ and add this line to your wiki's LocalSettings.php: @@ -25,7 +25,7 @@ $wgExtensionCredits['skin'][] = array( 'path' => __FILE__, 'name' => 'Nimbus', - 'version' => '3.0', + 'version' => '3.1', 'author' => array( 'Aaron Wright', 'David Pean', 'Inez Korczyński', 'Jack Phoenix' ), 'descriptionmsg' => 'nimbus-desc', 'url' => 'https://www.mediawiki.org/wiki/Skin:Nimbus', @@ -40,6 +40,7 @@ // Autoload the skin class, set up i18n, set up CSS & JS (via ResourceLoader) $wgAutoloadClasses['SkinNimbus'] = __DIR__ . '/Nimbus.skin.php'; $wgMessagesDirs['SkinNimbus'] = __DIR__ . '/i18n'; + $wgResourceModules['skins.nimbus'] = array( 'styles' => array( 'skins/Nimbus/nimbus/Nimbus.css' => array( 'media' => 'screen' ) ), 'scripts' => 'skins/Nimbus/nimbus/Menu.js', diff --git a/Nimbus.skin.php b/Nimbus.skin.php index d1cb42c..e7fb098 100644 --- a/Nimbus.skin.php +++ b/Nimbus.skin.php @@ -28,6 +28,7 @@ // Add CSS & JS $out->addModuleStyles( array( 'mediawiki.skinning.interface', + 'mediawiki.skinning.content.externallinks', 'skins.monobook.styles', 'skins.nimbus' ) ); @@ -277,7 +278,7 @@ <div id="article"> <div id="mw-js-message" style="display:none;"></div> - <div id="article-body"> + <div id="article-body" class="mw-body"> <?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div><?php } ?> <div id="article-text" class="clearfix"> <?php if ( $this->showPageTitle() ) { ?><h1 class="pagetitle"><?php $this->html( 'title' ) ?></h1><?php } ?> diff --git a/nimbus/Nimbus.css b/nimbus/Nimbus.css index 9ea8d98..43a4b7b 100644 --- a/nimbus/Nimbus.css +++ b/nimbus/Nimbus.css @@ -10,6 +10,17 @@ font-family: Arial; } +/** + * Revert https://gerrit.wikimedia.org/r/#/c/151395/ because it's ugly and + * unwanted for this skin, but we get it as a "nice" side-effect of loading + * MonoBook's main RL module... + */ +div.mw-body { + border: 0; + margin: 0; + padding: 0; +} + #container { margin-left: auto; margin-right: auto; @@ -24,77 +35,6 @@ #siteNotice { border: none; padding: 0px; -} - -/* -** External link styles (from Monobook's main.css) -** @see http://bugzilla.shoutwiki.com/show_bug.cgi?id=223 -** keep the whitespace in front of the ^=, hides rule from konqueror -** this is css3, the validator doesn't like it when validating as css2 -*/ -#article-text a.external, -#article-text a.external[href ^="gopher://";] { - /* @embed */ - background: url(../../monobook/external-ltr.png) center right no-repeat; - padding-right: 13px; -} -#article-text a.external[href ^="https://";], -.link-https { - /* @embed */ - background: url(../../monobook/lock_icon.gif) center right no-repeat; - padding-right: 16px; -} -#article-text a.external[href ^="mailto:";], -.link-mailto { - /* @embed */ - background: url(../../monobook/mail_icon.gif) center right no-repeat; - padding-right: 18px; -} -#article-text a.external[href ^="news:";] { - /* @embed */ - background: url(../../monobook/news_icon.png) center right no-repeat; - padding-right: 18px; -} -#article-text a.external[href ^="ftp://";], -.link-ftp { - /* @embed */ - background: url(../../monobook/file_icon.gif) center right no-repeat; - padding-right: 18px; -} -#article-text a.external[href ^="irc://"], -#article-text a.external[href ^="ircs://"], -.link-irc { - /* @embed */ - background: url(../../monobook/discussionitem_icon.gif) center right no-repeat; - padding-right: 18px; -} -#article-text a.external[href $=".ogg"], #article-text a.external[href $=".OGG"], -#article-text a.external[href $=".mid"], #article-text a.external[href $=".MID"], -#article-text a.external[href $=".midi"], #article-text a.external[href $=".MIDI"], -#article-text a.external[href $=".mp3"], #article-text a.external[href $=".MP3"], -#article-text a.external[href $=".wav"], #article-text a.external[href $=".WAV"], -#article-text a.external[href $=".wma"], #article-text a.external[href $=".WMA"], -.link-audio { - /* @embed */ - background: url(../../monobook/audio.png) center right no-repeat; - padding-right: 13px; -} -#article-text a.external[href $=".ogm"], #article-text a.external[href $=".OGM"], -#article-text a.external[href $=".avi"], #article-text a.external[href $=".AVI"], -#article-text a.external[href $=".mpeg"], #article-text a.external[href $=".MPEG"], -#article-text a.external[href $=".mpg"], #article-text a.external[href $=".MPG"], -.link-video { - /* @embed */ - background: url(../../monobook/video.png) center right no-repeat; - padding-right: 13px; -} -#article-text a.external[href $=".pdf"], #article-text a.external[href $=".PDF"], -#article-text a.external[href *=".pdf#"], #article-text a.external[href *=".PDF#"], -#article-text a.external[href *=".pdf?"], #article-text a.external[href *=".PDF?"], -.link-document { - /* @embed */ - background: url(../../monobook/document.png) center right no-repeat; - padding-right: 12px; } /* Interwiki Styling */ @@ -132,10 +72,6 @@ } .clearfix { display: inline-block; } - -/* Hides from IE-mac \*/ -* html .clearfix { height: 1%; } -/* End hide from IE-mac */ /** Buttons **/ .positive-button { -- To view, visit https://gerrit.wikimedia.org/r/176615 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09d28350a187598c450becb0e38e9ad504025f20 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Nimbus Gerrit-Branch: master Gerrit-Owner: Jack Phoenix <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
