Merge "Correct ContentHeader source order to match design"
This commit is contained in:
commit
9ac7a23234
|
@ -2,17 +2,7 @@
|
||||||
Content Header - Main <H1> title for all pages, with either the indicators or language selector.
|
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.
|
When language button is visible, indicators are placed in the ContentSubheader.mustache template instead.
|
||||||
}}
|
}}
|
||||||
<header class="mw-body-header">
|
<header class="mw-body-header vector-page-titlebar">
|
||||||
{{#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}}
|
|
||||||
|
|
||||||
{{#data-toc}}
|
{{#data-toc}}
|
||||||
<label
|
<label
|
||||||
id="vector-toc-collapsed-button"
|
id="vector-toc-collapsed-button"
|
||||||
|
@ -26,5 +16,16 @@
|
||||||
{{msg-vector-toc-collapsible-button-label}}
|
{{msg-vector-toc-collapsible-button-label}}
|
||||||
</label>
|
</label>
|
||||||
{{/data-toc}}
|
{{/data-toc}}
|
||||||
|
|
||||||
{{{html-title-heading}}}
|
{{{html-title-heading}}}
|
||||||
|
|
||||||
|
{{#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}}
|
||||||
</header>
|
</header>
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
.vector-page-titlebar {
|
||||||
|
display: flex;
|
||||||
|
border-bottom: 1px solid @border-color-base;
|
||||||
|
|
||||||
|
.firstHeading {
|
||||||
|
flex-grow: 1;
|
||||||
|
border: 0;
|
||||||
|
}
|
||||||
|
}
|
|
@ -12,6 +12,7 @@
|
||||||
margin-right: -@icon-padding-md;
|
margin-right: -@icon-padding-md;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
height: @height-button-lang;
|
height: @height-button-lang;
|
||||||
|
flex-shrink: 0;
|
||||||
|
|
||||||
.mw-ui-icon:before {
|
.mw-ui-icon:before {
|
||||||
// Put icon on correct standard normal state color.
|
// Put icon on correct standard normal state color.
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
|
|
||||||
// Components
|
// Components
|
||||||
@import './components/ArticleToolbar.less';
|
@import './components/ArticleToolbar.less';
|
||||||
|
@import './components/ContentHeader.less';
|
||||||
@import './components/SearchBoxLoader.less';
|
@import './components/SearchBoxLoader.less';
|
||||||
@import './components/VueEnhancedSearchBox.less';
|
@import './components/VueEnhancedSearchBox.less';
|
||||||
@import './components/Sidebar.less';
|
@import './components/Sidebar.less';
|
||||||
|
|
Loading…
Reference in New Issue