From a1b46bc0883e96bf8ac461b712f276d15bddc6e5 Mon Sep 17 00:00:00 2001
From: MatmaRex ' . $wgOut->getPageTitle() . '
';
- return $s;
- }
-
- function pageSubtitle() {
- global $wgOut;
-
- $sub = $wgOut->getSubtitle();
-
- if ( $sub == '' ) {
- global $wgExtraSubtitle;
- $sub = wfMessage( 'tagline' )->parse() . $wgExtraSubtitle;
- }
-
- $subpages = $this->getSkin()->subPageSubtitle();
- $sub .= !empty( $subpages ) ? "
$subpages" : ''; - $s = "
{$sub}
\n"; - - return $s; - } - function bottomLinks() { global $wgOut, $wgUser; $sep = wfMessage( 'pipe-separator' )->escaped() . "\n"; @@ -547,8 +498,19 @@ class CologneBlueTemplate extends BaseTemplate { if( $notice ) { $s .= "\n" . htmlspecialchars( $this->translator->translate( 'tagline' ) ) . "
"; + } + if ( $this->getSkin()->getOutput()->getSubtitle() ) { + $s .= "" . $this->getSkin()->getOutput()->getSubtitle() . "
"; + } + if ( $this->getSkin()->subPageSubtitle() ) { + $s .= "" . $this->getSkin()->subPageSubtitle() . "
"; + } + return $s; } diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css index 4716c38b87..511c81a34a 100644 --- a/skins/cologneblue/screen.css +++ b/skins/cologneblue/screen.css @@ -120,12 +120,12 @@ h1 .editsection { font-size: 55.6%; } -h1.pagetitle { +h1#firstHeading { padding-bottom: 0; margin-bottom: 0; } -#article p.subtitle { +#article p.subtitle, #article p.subpages, #article p.tagline { color: #666666; font-size: 11pt; font-weight: bold; -- 2.20.1