jenkins-bot has submitted this change and it was merged.
Change subject: VisualEditor: Bring in overlay z-index hack from VE-MW
......................................................................
VisualEditor: Bring in overlay z-index hack from VE-MW
Change-Id: Ia46e6b4d7a63a7a3c46df9650493e095791bce37
---
M resources/mobile.editor.ve/VisualEditorOverlay.less
1 file changed, 65 insertions(+), 60 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mobile.editor.ve/VisualEditorOverlay.less
b/resources/mobile.editor.ve/VisualEditorOverlay.less
index 2ae5131..8ce4761 100644
--- a/resources/mobile.editor.ve/VisualEditorOverlay.less
+++ b/resources/mobile.editor.ve/VisualEditorOverlay.less
@@ -1,67 +1,67 @@
@import "minerva.variables";
@import "minerva.mixins";
-.editor-overlay-ve .content {
- // VisualEditor doesn't have collapsible-heading class, so we need to
apply
- // heading styles to the header tags directly.
- h1, h2 {
- margin-bottom: .5em;
- border-bottom: solid 1px @sectionBorderColor;
- overflow: hidden;
- }
-
- // Styling for images (as output by Parsiod)
- // These styles are mostly derived from content.parsoid.less, which the
Minerva skin
- // opts out of (since the styles are largely Vectorish).
- // FIXME: Once Parser and Parsoid output are synchronized, we'll want
to move these
- // from here into the regular Minerva content styles.
- figure[typeof*='mw:Image'] {
- max-width: 100%;
- background-color: transparent;
- border: none;
- padding: 0;
- font-size: inherit;
- // Defaults to right alignment when not explicitly set. Should
be flippable.
- margin: .6em 0 .6em 1.4em;
-
- &.mw-halign-left {
- /* @noflip */
- margin: .6em 1.4em .6em 0;
- /* @noflip */
- clear: left;
- /* @noflip */
- float: left;
- }
-
- &.mw-halign-right {
- /* @noflip */
- margin: .6em 0 .6em 1.4em;
- /* @noflip */
- clear: right;
- /* @noflip */
- float: right;
- }
-
- &.mw-halign-center {
- margin: .6em auto .6em auto;
- clear: none;
- float: none;
- }
-
- img {
- border: none;
- }
-
- figcaption {
- font-size: .8em;
- line-height: 1.5;
- padding: 0;
- color: @grayMedium;
- }
- }
-}
-
.editor-overlay-ve {
+ .content {
+ // VisualEditor doesn't have collapsible-heading class, so we
need to apply
+ // heading styles to the header tags directly.
+ h1, h2 {
+ margin-bottom: .5em;
+ border-bottom: solid 1px @sectionBorderColor;
+ overflow: hidden;
+ }
+
+ // Styling for images (as output by Parsiod)
+ // These styles are mostly derived from content.parsoid.less,
which the Minerva skin
+ // opts out of (since the styles are largely Vectorish).
+ // FIXME: Once Parser and Parsoid output are synchronized,
we'll want to move these
+ // from here into the regular Minerva content styles.
+ figure[typeof*='mw:Image'] {
+ max-width: 100%;
+ background-color: transparent;
+ border: none;
+ padding: 0;
+ font-size: inherit;
+ // Defaults to right alignment when not explicitly set.
Should be flippable.
+ margin: .6em 0 .6em 1.4em;
+
+ &.mw-halign-left {
+ /* @noflip */
+ margin: .6em 1.4em .6em 0;
+ /* @noflip */
+ clear: left;
+ /* @noflip */
+ float: left;
+ }
+
+ &.mw-halign-right {
+ /* @noflip */
+ margin: .6em 0 .6em 1.4em;
+ /* @noflip */
+ clear: right;
+ /* @noflip */
+ float: right;
+ }
+
+ &.mw-halign-center {
+ margin: .6em auto .6em auto;
+ clear: none;
+ float: none;
+ }
+
+ img {
+ border: none;
+ }
+
+ figcaption {
+ font-size: .8em;
+ line-height: 1.5;
+ padding: 0;
+ color: @grayMedium;
+ }
+ }
+ }
+
// prevent disappearing after scrolling when
-webkit-overflow-scrolling: touch
// is used (http://stackoverflow.com/a/10170170)
.overlay-content * {
@@ -93,3 +93,8 @@
border: 0;
}
}
+
+.ve-ui-overlay {
+ /* enough to cover .overlay-header-container with z-index: 5 */
+ z-index: 6;
+}
--
To view, visit https://gerrit.wikimedia.org/r/230398
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia46e6b4d7a63a7a3c46df9650493e095791bce37
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
