jonny
/
Vector-Local
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[HTML] Refactor Content header templates"

This commit is contained in:
jenkins-bot 2022-05-06 18:43:34 +00:00 committed by Gerrit Code Review
parent dba3050645 1288c97179
commit b6847038f8
4 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
includes/templates/ContentHeader.mustache Normal file
View File

@ -0,0 +1,17 @@
{{!-
Content Header - Main <H1> title for all pages, with either the indicators or language selector.
When language button is visible, indicators are placed in the ContentSubheader.mustache template instead.
}}
<header class="mw-body-header">
{{#is-language-in-content-top}}
{{#data-portlets.data-languages}}
{{>Menu}}
{{/data-portlets.data-languages}}
{{/is-language-in-content-top}}
{{^is-language-in-content-top}}
{{>Indicators}}
{{/is-language-in-content-top}}
{{{html-title-heading}}}
</header>

12
includes/templates/ContentSubheader.mustache Normal file
View File

@ -0,0 +1,12 @@
{{!-
Content Subheader - Placed below the content header on all pages.
Contains the indicators (if the language button is beside the title)
qnd tagline, which is only rendered on article page.
}}
<div class="mw-body-subheader">
{{#is-language-in-content-top}}
{{>Indicators}}
{{/is-language-in-content-top}}
{{#is-article}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/is-article}}
</div>

21
includes/templates/skin.mustache
View File

@ -54,28 +54,11 @@
<a id="top"></a>
<div id="siteNotice">{{{html-site-notice}}}</div>
{{^is-language-in-content}}
{{>Indicators}}
{{{html-title-heading}}}
{{/is-language-in-content}}
{{>ContentHeader}}
{{#is-language-in-content}}
<header class="mw-body-header">
{{#is-language-in-content-top}}
{{#data-portlets.data-languages}}{{>Menu}}{{/data-portlets.data-languages}}
{{/is-language-in-content-top}}
{{{html-title-heading}}}
{{>Indicators}}
{{#is-article}}
<div id="siteSub" class="noprint">{{msg-tagline}}</div>
{{/is-article}}
</header>
{{/is-language-in-content}}
{{>ContentSubheader}}
<div id="bodyContent" class="vector-body">
{{^is-language-in-content}}
{{#is-article}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/is-article}}
{{/is-language-in-content}}
<div id="contentSub"{{{html-user-language-attributes}}}>{{{html-subtitle}}}</div>
<div id="contentSub2">{{{html-undelete-link}}}</div>
{{{html-user-message}}}

8
resources/skins.vector.styles/layouts/screen.less
View File

@ -120,6 +120,14 @@ body {
z-index: @z-index-base;
}
// Prevents margin collapsing on first element (typically a <p>) of content.
// Custom because .mixin-clearfix() automatically appends :after to the selector
// and doesn't prevent margin collapsing.
.vector-body:before {
content: '';
display: table;
}
/* Navigation Containers */
.mw-article-toolbar-container {
// Clear the floats on #left-navigation and #right-navigation.