Make .ve-init-mw-target-surface styles not apply to nested non-target surfaces

The class .ve-init-mw-target-surface is used on the same element
as .ve-ui-surface. This element contains surface overlays
.ve-ui-overlay, which can contain other .ve-ui-surface elements
(inside inspectors), which would then erroneously have the target
surface styles applied.

Bug: T284312
Change-Id: I8d20a830dc48f6a098b0f9e9a7c7c1656de0fe56
This commit is contained in:
Bartosz Dziewoński 2021-06-04 21:40:05 +02:00
parent 32ecfe4caf
commit 9c2c4b82c7
5 changed files with 13 additions and 13 deletions

View file

@ -14,7 +14,7 @@
font-size: 0.8em;
}
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ui-surface-placeholder > * {
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface > .ve-ui-surface-placeholder > * {
/* Fix margin overlap */
margin-top: 0;
}

View file

@ -5,8 +5,8 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ce-attachedRootNode,
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ui-surface-placeholder {
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface > .ve-ce-attachedRootNode,
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface > .ve-ce-surface .ve-ui-surface-placeholder {
padding: 0;
/* Provide clickable gutter */
padding-left: 1000px;

View file

@ -19,7 +19,7 @@
padding-bottom: 0.9921875em;
}
.mw-body .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ui-surface-placeholder > * {
.mw-body .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface > .ve-ui-surface-placeholder > * {
/* Fix margin overlap */
margin-top: 0;
/* Placeholder doesn't need a border as well */

View file

@ -30,12 +30,12 @@
margin: 0 -1rem;
}
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ce-attachedRootNode,
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ui-surface-placeholder {
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface > .ve-ce-surface .ve-ce-attachedRootNode,
.ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface > .ve-ui-surface-placeholder {
padding: 0 1rem;
}
.mw-body .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ui-surface-placeholder > * {
.mw-body .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface > .ve-ui-surface-placeholder > * {
/* Fix margin overlap */
margin-top: 0;
/* Placeholder doesn't need a border as well */
@ -55,8 +55,8 @@
margin: 0 -1.5rem;
}
.skin-vector-legacy .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ce-attachedRootNode,
.skin-vector-legacy .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface .ve-ui-surface-placeholder {
.skin-vector-legacy .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface > .ve-ce-surface .ve-ce-attachedRootNode,
.skin-vector-legacy .ve-init-mw-desktopArticleTarget .ve-init-mw-target-surface > .ve-ui-surface-placeholder {
padding: 0 1.5rem;
}

View file

@ -10,8 +10,8 @@
// (see .content styles in Minerva)
margin-bottom: 1em;
.ve-ce-attachedRootNode,
.ve-ui-surface-placeholder {
> .ve-ce-surface .ve-ce-attachedRootNode,
> .ve-ui-surface-placeholder {
padding: 0;
&:before {
@ -23,7 +23,7 @@
}
}
.ve-ce-attachedRootNode {
> .ve-ce-surface .ve-ce-attachedRootNode {
// Ensure whole page is focusable (T109508)
// Subtract toolbar height, margin-bottom and a little more
// to prevent scrolling.
@ -68,7 +68,7 @@
}
@media screen and ( max-width: 767px ) {
.ve-init-mw-target-surface .ve-ui-surface-placeholder > * {
.ve-init-mw-target-surface > .ve-ui-surface-placeholder > * {
/* Fix margin overlap */
margin-top: 0;
/* Placeholder doesn't need a border as well */