diff --git a/includes/templates/skin-legacy.mustache b/includes/templates/skin-legacy.mustache index d75c949d5..d4351b094 100644 --- a/includes/templates/skin-legacy.mustache +++ b/includes/templates/skin-legacy.mustache @@ -32,7 +32,7 @@
{{{html-site-notice}}}
{{>Indicators}}

{{{html-title}}}

-
+
{{#is-article}}
{{msg-tagline}}
{{/is-article}}
{{{html-subtitle}}}
{{{html-undelete-link}}}
diff --git a/includes/templates/skin.mustache b/includes/templates/skin.mustache index 964c6cd49..97848489c 100644 --- a/includes/templates/skin.mustache +++ b/includes/templates/skin.mustache @@ -70,7 +70,7 @@ {{/is-language-in-header}} -
+
{{^is-language-in-header}} {{#is-article}}
{{msg-tagline}}
{{/is-article}} {{/is-language-in-header}} diff --git a/resources/common/typography.less b/resources/common/typography.less index 49dc842ad..8c781e63a 100644 --- a/resources/common/typography.less +++ b/resources/common/typography.less @@ -31,13 +31,13 @@ pre, .mixin-screen-reader-text; } -/* Allow edit sections outside of mw-body-content (T160269) */ +/* Use unscoped selector to allow edit sections outside of .mw-body-content and .vector-body (T160269) */ .mw-editsection, .mw-editsection-like { font-family: @font-family-sans; } -/* Main content area, including siteNotice, indicators, firstHeading and `.mw-body-content`. */ +/* Main content area, including siteNotice, indicators, categories, firstHeading and `.vector-body`. */ .mw-body { // h1's can exist outside of `.mw-body-content` so some heading styles // therefore need to be defined in `.mw-body` as well. @@ -70,7 +70,9 @@ pre, } } -.mw-body-content { +// FIXME: [ id='bodyContent' ] selector needed for cached HTML. +[ id='bodyContent' ], +.vector-body { font-size: @font-size-base; // Support IE 9-11, Trident cuts values 2 digits after decimal point. // `calc` enables to set correct calculation in place again. See T102364. diff --git a/resources/common/variables.less b/resources/common/variables.less index df3adcc22..d64e26fd6 100644 --- a/resources/common/variables.less +++ b/resources/common/variables.less @@ -132,7 +132,7 @@ @z-index-menu-checkbox: 1; @z-index-search-button: 1; @z-index-search-loader: 1; -// Ensure that this is displayed on top of .mw-body-content and clickable. +// Ensure that this is displayed on top of .vector-body and clickable. @z-index-indicators: 1; // See skinStyles/jquery.ui/jquery.ui.slider.css. // @z-index-ui-slider-range: 1; diff --git a/resources/skins.vector.styles.legacy/layouts/screen.less b/resources/skins.vector.styles.legacy/layouts/screen.less index d62e391b2..724642287 100644 --- a/resources/skins.vector.styles.legacy/layouts/screen.less +++ b/resources/skins.vector.styles.legacy/layouts/screen.less @@ -58,17 +58,13 @@ body { z-index: @z-index-indicators; } -.mw-body-content { +// FIXME: [ id='bodyContent' ] selector needed for cached HTML. +[ id='bodyContent' ], +.vector-body { position: relative; z-index: @z-index-base; } -// FIXME: Can be removed when the `content-parser-output` feature in `skins.vector.styles.legacy` -// is enabled. The definition in core still needs work (see T279008). -#bodyContent { - .mixin-clearfix(); -} - // FIXME: Temporarily disable the core rule which applies to the wrong element. // The definition in core still needs work (see T279008). .mw-parser-output:after { diff --git a/resources/skins.vector.styles/components/VueEnhancedSearchBox.less b/resources/skins.vector.styles/components/VueEnhancedSearchBox.less index 349e4577a..3244c7c56 100644 --- a/resources/skins.vector.styles/components/VueEnhancedSearchBox.less +++ b/resources/skins.vector.styles/components/VueEnhancedSearchBox.less @@ -17,7 +17,7 @@ // We have to put those styles outside `.skin-vector-search-vue`, // as we can't address no-JS modern and Vue enhanced otherwise. #p-search { - // Use Vector's base font-size, as this is a component outside of `.mw-body-content`. + // Use Vector's base font-size, as this is a component outside of `.vector-body`. font-size: @font-size-base; // Support IE 9-11, Trident cuts values 2 digits after decimal point. // `calc` enables to set correct calculation in place again. See T102364. diff --git a/resources/skins.vector.styles/layouts/screen.less b/resources/skins.vector.styles/layouts/screen.less index 8f37193c7..3537806d6 100644 --- a/resources/skins.vector.styles/layouts/screen.less +++ b/resources/skins.vector.styles/layouts/screen.less @@ -210,8 +210,9 @@ body { .mw-body #p-lang-btn { float: right; } - -.mw-body-content { +// FIXME: [ id='bodyContent' ] selector needed for cached HTML. +[ id='bodyContent' ], +.vector-body { position: relative; z-index: @z-index-base; }