Jack Phoenix has uploaded a new change for review. https://gerrit.wikimedia.org/r/176611
Change subject: Version 1.2.2 -- fixed for MW 1.24 ...................................................................... Version 1.2.2 -- fixed for MW 1.24 Deprecated MonoBookTemplateToolboxEnd and IE/Mac fixes removed, too. Change-Id: If009d2f2358207e1e7d79cad8256d04e5d9379c6 --- M Bouquet.php M Bouquet.skin.php M resources/style.css 3 files changed, 10 insertions(+), 82 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Bouquet refs/changes/11/176611/1 diff --git a/Bouquet.php b/Bouquet.php index 1476239..50d5d21 100644 --- a/Bouquet.php +++ b/Bouquet.php @@ -11,7 +11,7 @@ * @ingroup Skins * @author Automattic * @author Jack Phoenix <[email protected]> -- MediaWiki port - * @date 12 October 2014 + * @date 30 November 2014 * * To install, place the Bouquet folder (the folder containing this file!) into * skins/ and add this line to your wiki's LocalSettings.php: @@ -26,7 +26,7 @@ $wgExtensionCredits['skin'][] = array( 'path' => __FILE__, 'name' => 'Bouquet', - 'version' => '1.2.1', + 'version' => '1.2.2', 'author' => array( '[http://automattic.com Automattic]', 'Jack Phoenix' ), 'description' => 'Elegant, simple theme inspired by the beauty found in flowers', 'url' => 'https://www.mediawiki.org/wiki/Skin:Bouquet', @@ -38,16 +38,12 @@ // *this* file. $wgValidSkinNames['bouquet'] = 'Bouquet'; -// 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['SkinBouquet'] = __DIR__ . '/Bouquet.skin.php'; $wgMessagesDirs['SkinBouquet'] = __DIR__ . '/i18n'; + $wgResourceModules['skins.bouquet'] = 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 Bouquet skin 'skins/Bouquet/resources/print.css' => array( 'media' => 'print' ), 'skins/Bouquet/resources/style.css' => array( 'media' => 'screen' ) diff --git a/Bouquet.skin.php b/Bouquet.skin.php index 014da98..91fd01a 100644 --- a/Bouquet.skin.php +++ b/Bouquet.skin.php @@ -42,7 +42,11 @@ parent::setupSkinUserCss( $out ); // Load CSS via ResourceLoader - $out->addModuleStyles( 'skins.bouquet' ); + $out->addModuleStyles( array( + 'mediawiki.skinning.interface', + 'mediawiki.skinning.content.externallinks', + 'skins.bouquet' + ) ); } } @@ -361,7 +365,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 7571e69..c940702 100644 --- a/resources/style.css +++ b/resources/style.css @@ -1737,74 +1737,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; @@ -1843,10 +1775,6 @@ div#content .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/176611 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If009d2f2358207e1e7d79cad8256d04e5d9379c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Bouquet Gerrit-Branch: master Gerrit-Owner: Jack Phoenix <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
