golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
jdlrobson 2017-11-28 13:55:58 -08:00 committed by Jdlrobson
parent 01d6c5ed21
commit c986db6c0e
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
includes/skins/SkinMinerva.php
View File

@ -814,7 +814,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
* @return string HTML for tagline * @return string HTML for tagline
*/ */
protected function getTaglineHtml() { protected function getTaglineHtml() {
$tagline = false; $tagline = '';
if ( $this->getUserPageHelper()->isUserPage() ) { if ( $this->getUserPageHelper()->isUserPage() ) {
$pageUser = $this->getUserPageHelper()->getPageUser(); $pageUser = $this->getUserPageHelper()->getPageUser();
@ -835,16 +835,13 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
} else { } else {
$title = $this->getTitle(); $title = $this->getTitle();
if ( $title ) { if ( $title ) {
if ( !$title->isMainPage() && $title->inNamespace( NS_MAIN ) ) {
$vars = $this->getSkinConfigVariables(); $vars = $this->getSkinConfigVariables();
$tagline = $vars['wgMFDescription']; $tagline = $vars['wgMFDescription'];
} }
} }
}
$attrs[ 'class' ] = 'tagline'; $attrs[ 'class' ] = 'tagline';
return $tagline ? return Html::element( 'div', $attrs, $tagline );
Html::element( 'div', $attrs, $tagline ) : '';
} }
/** /**
* Returns the HTML representing the heading. * Returns the HTML representing the heading.

2
resources/skins.minerva.base.styles/pageactions.less
View File

@ -26,7 +26,7 @@
.tagline { .tagline {
color: @colorGray5; color: @colorGray5;
font-size: 0.85em; font-size: 0.85em;
margin: 4px 0 0; margin: 2px 0 0;
&:first-letter { &:first-letter {
text-transform: capitalize; text-transform: capitalize;

13
skinStyles/mobile.special.styles/minerva.less
View File

@ -2,21 +2,22 @@
.ns-special { .ns-special {
#content { #content {
@verticalPadding: 0.5em;
#section_0 { #section_0 {
padding: @verticalPadding 0; padding: 34px 0 0;
text-align: center; font-size: 1.5em;
font-size: 1.25em;
font-weight: bold; font-weight: bold;
border: 0;
} }
.pre-content { .pre-content {
padding: 0; padding: 0;
border-bottom: 0;
} }
} }
// Specific to override mobile display
.heading-holder .tagline {
margin-bottom: 15px;
}
h1, h1,
h2 { h2 {
// Important given we have no idea which rules special pages are enforcing // Important given we have no idea which rules special pages are enforcing