Jack Phoenix has uploaded a new change for review. https://gerrit.wikimedia.org/r/176614
Change subject: Version 1.3.1 -- fixed for MW 1.24 ...................................................................... Version 1.3.1 -- fixed for MW 1.24 Change-Id: I534224113794f5b3f98f736a6a22c03048b074e5 --- M DuskToDawn.php M DuskToDawn.skin.php M resources/style.css 3 files changed, 11 insertions(+), 83 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/DuskToDawn refs/changes/14/176614/1 diff --git a/DuskToDawn.php b/DuskToDawn.php index 2dc570f..070b428 100644 --- a/DuskToDawn.php +++ b/DuskToDawn.php @@ -6,7 +6,7 @@ * @ingroup Skins * @author Automattic * @author Jack Phoenix <[email protected]> -- MediaWiki port - * @date 9 February 2014 + * @date 30 November 2014 * @see http://theme.wordpress.com/themes/dusk-to-dawn/ * @see http://wp-themes.com/dusk-to-dawn/ * @@ -23,7 +23,7 @@ $wgExtensionCredits['skin'][] = array( 'path' => __FILE__, 'name' => 'Dusk To Dawn', - 'version' => '1.3', + 'version' => '1.3.1', 'author' => array( '[http://automattic.com/ Automattic]', 'Jack Phoenix' ), 'description' => 'A dark theme that melds old-style organic ornaments with modern design and typography', 'url' => 'https://www.mediawiki.org/wiki/Skin:DuskToDawn', @@ -35,16 +35,12 @@ // *this* file. $wgValidSkinNames['dusktodawn'] = 'DuskToDawn'; -// Autoload the skin class, make it a valid skin, set up i18n, set up CSS & JS -// (via ResourceLoader) +// Autoload the skin class, set up i18n, set up CSS & JS (via ResourceLoader) $wgAutoloadClasses['SkinDuskToDawn'] = __DIR__ . '/DuskToDawn.skin.php'; $wgMessagesDirs['SkinDuskToDawn'] = __DIR__ . '/i18n'; + $wgResourceModules['skins.dusktodawn'] = array( 'styles' => array( - // MonoBook also loads these - 'skins/common/commonElements.css' => array( 'media' => 'screen' ), - 'skins/common/commonContent.css' => array( 'media' => 'screen' ), - 'skins/common/commonInterface.css' => array( 'media' => 'screen' ), // Styles custom to the DuskToDawn skin 'skins/DuskToDawn/resources/style.css' => array( 'media' => 'screen' ) ), diff --git a/DuskToDawn.skin.php b/DuskToDawn.skin.php index 087ba18..e921b41 100644 --- a/DuskToDawn.skin.php +++ b/DuskToDawn.skin.php @@ -9,7 +9,7 @@ * @ingroup Skins */ class SkinDuskToDawn extends SkinTemplate { - var $skinname = 'dusktodawn', $stylename = 'dusktodawn', + public $skinname = 'dusktodawn', $stylename = 'dusktodawn', $template = 'DuskToDawnTemplate', $useHeadElement = true; /** @@ -21,7 +21,11 @@ parent::setupSkinUserCss( $out ); // Load CSS via ResourceLoader - $out->addModuleStyles( 'skins.dusktodawn' ); + $out->addModuleStyles( array( + 'mediawiki.skinning.interface', + 'mediawiki.skinning.content.externallinks', + 'skins.dusktodawn' + ) ); // HTML5 shim has to be loaded this way for older IEs... $out->addHeadItem( 'html5shim', @@ -295,7 +299,7 @@ foreach ( $this->getToolbox() as $key => $tbItem ) { echo $this->makeListItem( $key, $tbItem ); } - wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) ); + wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ) ); ?> </ul> diff --git a/resources/style.css b/resources/style.css index ee1ce34..ed9a8c4 100644 --- a/resources/style.css +++ b/resources/style.css @@ -1492,74 +1492,6 @@ margin: 5px; } -/* -** keep the whitespace in front of the ^=, hides rule from Konqueror -** this is CSS 3, the validator doesn't like it when validating as CSS 2 -*/ -div#content article a.external, -div#content article a.external[href ^="gopher://";] { - /* @embed */ - background: url(../../monobook/external-ltr.png) center right no-repeat; - padding-right: 13px; -} -div#content article a.external[href ^="https://";], -.link-https { - /* @embed */ - background: url(../../monobook/lock_icon.gif) center right no-repeat; - padding-right: 16px; -} -div#content article a.external[href ^="mailto:";], -.link-mailto { - /* @embed */ - background: url(../../monobook/mail_icon.gif) center right no-repeat; - padding-right: 18px; -} -div#content article a.external[href ^="news://";] { - /* @embed */ - background: url(../../monobook/news_icon.png) center right no-repeat; - padding-right: 18px; -} -div#content article a.external[href ^="ftp://";], -.link-ftp { - /* @embed */ - background: url(../../monobook/file_icon.gif) center right no-repeat; - padding-right: 18px; -} -div#content article a.external[href ^="irc://"], -.link-irc { - /* @embed */ - background: url(../../monobook/discussionitem_icon.gif) center right no-repeat; - padding-right: 18px; -} -div#content article a.external[href $=".ogg"], div#content article a.external[href $=".OGG"], -div#content article a.external[href $=".mid"], div#content article a.external[href $=".MID"], -div#content article a.external[href $=".midi"], div#content article a.external[href $=".MIDI"], -div#content article a.external[href $=".mp3"], div#content article a.external[href $=".MP3"], -div#content article a.external[href $=".wav"], div#content article a.external[href $=".WAV"], -div#content article a.external[href $=".wma"], div#content article a.external[href $=".WMA"], -.link-audio { - /* @embed */ - background: url("../../monobook/audio.png") center right no-repeat; - padding-right: 13px; -} -div#content article a.external[href $=".ogm"], div#content article a.external[href $=".OGM"], -div#content article a.external[href $=".avi"], div#content article a.external[href $=".AVI"], -div#content article a.external[href $=".mpeg"], div#content article a.external[href $=".MPEG"], -div#content article a.external[href $=".mpg"], div#content article a.external[href $=".MPG"], -.link-video { - /* @embed */ - background: url("../../monobook/video.png") center right no-repeat; - padding-right: 13px; -} -div#content article a.external[href $=".pdf"], div#content article a.external[href $=".PDF"], -div#content article a.external[href *=".pdf#"], div#content article a.external[href *=".PDF#"], -div#content article a.external[href *=".pdf?"], div#content article a.external[href *=".PDF?"], -.link-document { - /* @embed */ - background: url("../../monobook/document.png") center right no-repeat; - padding-right: 12px; -} - /* Diffs */ table.diff { background-color: transparent; @@ -1599,10 +1531,6 @@ .clearfix { display: inline-block; } - -/* Hides from IE-mac \*/ -* html .clearfix { height: 1%; } -/* End hide from IE-mac */ /** Comments */ div#allcomments .full, -- To view, visit https://gerrit.wikimedia.org/r/176614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I534224113794f5b3f98f736a6a22c03048b074e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/DuskToDawn Gerrit-Branch: master Gerrit-Owner: Jack Phoenix <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
