Merge "Introduce the vector-body class"

This commit is contained in:
jenkins-bot 2021-05-24 14:51:07 +00:00 committed by Gerrit Code Review
commit a9215e49a6
7 changed files with 15 additions and 16 deletions

View file

@ -32,7 +32,7 @@
<div id="siteNotice">{{{html-site-notice}}}</div>
{{>Indicators}}
<h1 id="firstHeading" class="firstHeading" {{{html-user-language-attributes}}}>{{{html-title}}}</h1>
<div id="bodyContent">
<div id="bodyContent" class="vector-body">
{{#is-article}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/is-article}}
<div id="contentSub"{{{html-user-language-attributes}}}>{{{html-subtitle}}}</div>
<div id="contentSub2">{{{html-undelete-link}}}</div>

View file

@ -70,7 +70,7 @@
</header>
{{/is-language-in-header}}
<div id="bodyContent">
<div id="bodyContent" class="vector-body">
{{^is-language-in-header}}
{{#is-article}}<div id="siteSub" class="noprint">{{msg-tagline}}</div>{{/is-article}}
{{/is-language-in-header}}

View file

@ -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.

View file

@ -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;

View file

@ -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 {

View file

@ -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.

View file

@ -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;
}