jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393920 )
Change subject: Always render taglines unconditionally and update styles ...................................................................... Always render taglines unconditionally and update styles Adjust tagline margin per Nirzar: https://phabricator.wikimedia.org/T180095#3801719 Note, this will enable the tagline everywhere. Change-Id: I3bce2a3472ab2e53261965c953572f35cc740eed Bug: T180095 --- M includes/skins/SkinMinerva.php M resources/skins.minerva.base.styles/pageactions.less M skinStyles/mobile.special.styles/minerva.less 3 files changed, 12 insertions(+), 14 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index d5e3d2e..9382f75 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -814,7 +814,7 @@ * @return string HTML for tagline */ protected function getTaglineHtml() { - $tagline = false; + $tagline = ''; if ( $this->getUserPageHelper()->isUserPage() ) { $pageUser = $this->getUserPageHelper()->getPageUser(); @@ -835,16 +835,13 @@ } else { $title = $this->getTitle(); if ( $title ) { - if ( !$title->isMainPage() && $title->inNamespace( NS_MAIN ) ) { - $vars = $this->getSkinConfigVariables(); - $tagline = $vars['wgMFDescription']; - } + $vars = $this->getSkinConfigVariables(); + $tagline = $vars['wgMFDescription']; } } $attrs[ 'class' ] = 'tagline'; - return $tagline ? - Html::element( 'div', $attrs, $tagline ) : ''; + return Html::element( 'div', $attrs, $tagline ); } /** * Returns the HTML representing the heading. diff --git a/resources/skins.minerva.base.styles/pageactions.less b/resources/skins.minerva.base.styles/pageactions.less index 0742202..050c83f 100644 --- a/resources/skins.minerva.base.styles/pageactions.less +++ b/resources/skins.minerva.base.styles/pageactions.less @@ -26,7 +26,7 @@ .tagline { color: @colorGray5; font-size: 0.85em; - margin: 4px 0 0; + margin: 2px 0 0; &:first-letter { text-transform: capitalize; diff --git a/skinStyles/mobile.special.styles/minerva.less b/skinStyles/mobile.special.styles/minerva.less index 8d78eaf..1e945b3 100644 --- a/skinStyles/mobile.special.styles/minerva.less +++ b/skinStyles/mobile.special.styles/minerva.less @@ -2,21 +2,22 @@ .ns-special { #content { - @verticalPadding: 0.5em; #section_0 { - padding: @verticalPadding 0; - text-align: center; - font-size: 1.25em; + padding: 34px 0 0; + font-size: 1.5em; font-weight: bold; - border: 0; } .pre-content { padding: 0; - border-bottom: 0; } } + // Specific to override mobile display + .heading-holder .tagline { + margin-bottom: 15px; + } + h1, h2 { // Important given we have no idea which rules special pages are enforcing -- To view, visit https://gerrit.wikimedia.org/r/393920 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3bce2a3472ab2e53261965c953572f35cc740eed Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/skins/MinervaNeue Gerrit-Branch: specialpages Gerrit-Owner: Jdlrobson <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Jdlrobson <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
