Foxtrott has uploaded a new change for review. https://gerrit.wikimedia.org/r/89520
Change subject: fix bug 54931 (Legends of the Special:Preferences should appear as Nav Tabs) ...................................................................... fix bug 54931 (Legends of the Special:Preferences should appear as Nav Tabs) * replace screens.css by screens.less and load as Bootstrap module * assign some less rules to #preftoc to enable nav tabs Change-Id: I91d72424728126cc78d8a8a55d187ce3a2c22f7a --- M Chameleon.skin.php M chameleon.php R css/screen.less 3 files changed, 26 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/chameleon refs/changes/20/89520/1 diff --git a/Chameleon.skin.php b/Chameleon.skin.php index 54c9a65..ba68085 100644 --- a/Chameleon.skin.php +++ b/Chameleon.skin.php @@ -46,7 +46,6 @@ // load Bootstrap styles $out->addModuleStyles( 'ext.bootstrap' ); - $out->addModuleStyles( 'skins.chameleon' ); } /** diff --git a/chameleon.php b/chameleon.php index 39169cc..38ab3a7 100644 --- a/chameleon.php +++ b/chameleon.php @@ -83,14 +83,6 @@ // register message file for i18n $wgExtensionMessagesFiles['Chameleon'] = dirname( __FILE__ ) . '/Chameleon.i18n.php'; -// register resource modules -$wgResourceModules['skins.chameleon'] = array( - 'styles' => array( - 'chameleon/css/screen.css' => array( 'media' => 'screen' ), - ), - 'remoteBasePath' => &$GLOBALS['wgStylePath'], - 'localBasePath' => &$GLOBALS['wgStyleDirectory'], -); - // register Bootstrap modules (for now, just register everything) Bootstrap::getBootstrap()->addAllBootstrapModules(); +Bootstrap::getBootstrap()->addExternalModule( __DIR__, '/css/screen.less' ); diff --git a/css/screen.css b/css/screen.less similarity index 75% rename from css/screen.css rename to css/screen.less index 17afddd..bd78605 100644 --- a/css/screen.css +++ b/css/screen.less @@ -79,3 +79,28 @@ #wpTextbox1 { width: 100%; } + +#preftoc { + .nav; + .nav-tabs; + + margin-bottom: 2ex; + + // TODO: not possible with current lessphp compiler (https://github.com/leafo/lessphp/issues/481). Enable when this issue is fixed. + //> li.selected { + // .nav-tabs > li.active; + //} + + > li.selected > a { + &, + &:hover, + &:focus { + color: @nav-tabs-active-link-hover-color; + background-color: @nav-tabs-active-link-hover-bg; + border: 1px solid @nav-tabs-active-link-hover-border-color; + border-bottom-color: transparent; + cursor: default; + } + } +} + -- To view, visit https://gerrit.wikimedia.org/r/89520 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91d72424728126cc78d8a8a55d187ce3a2c22f7a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/chameleon Gerrit-Branch: master Gerrit-Owner: Foxtrott <s7ep...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits