Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175222
Change subject: Fix MW skin hacks
......................................................................
Fix MW skin hacks
* Ensure surface widget font size matches main surface,
move vector-specific hack to vector css file and fix.
* Fix base font size in non-isolated monobook windows.
* Move monobook z-index hack to global overlay only.
Change-Id: I1607dc77f81ac9c522e09a3b502aeb38fee02178
---
M VisualEditor.php
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
D modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css
4 files changed, 17 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/22/175222/1
diff --git a/VisualEditor.php b/VisualEditor.php
index 1af5366..dad670e 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -799,7 +799,6 @@
// ui
'modules/ve-mw/ui/styles/inspectors/ve.ui.MWExtensionInspector.css',
'modules/ve-mw/ui/styles/dialogs/ve.ui.MWSaveDialog.css',
-
'modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css',
'modules/ve-mw/ui/styles/widgets/ve.ui.MWTitleInputWidget.css',
'modules/ve-mw/ui/styles/widgets/ve.ui.MWTocWidget.css',
),
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
index 7a2d7ef..6ac10c5 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
@@ -7,23 +7,23 @@
.ve-init-mw-viewPageTarget-toolbar {
margin: -0.6em -0.8em 1em -0.8em;
- /* So that the toolbar always appears over the overlay */
- z-index: 5;
-}
-
-/* Correct for Monobook's small font in toolbars and contexts, but beware:
- * - Only apply this to the outer toolbar, not the inner toolbar (otherwise
it multiplies)
- * - Only apply this to the main surface's context, not inside dialogs (they
have their own
- * font size fixes)
- */
-.ve-init-mw-viewPageTarget-toolbar,
-.ve-init-mw-viewPageTarget-surface .ve-ui-context {
+ /* Correct for Monobook's x-small font on the root toolbar */
font-size: 1.25em;
line-height: 1.5em;
}
+.oo-ui-window {
+ /* Correct for Monobook's x-small font on non-isolated windows */
+ /* 0.8em / x-small */
+ font-size: 1em;
+}
+
.ve-ui-overlay {
+ /* Mimic #globalWrapper */
+ font-size: 127%;
+}
+
+.ve-ui-overlay-global {
/* So that the overlay always appears over the site logo, search box
and personal tools */
z-index: 4;
- font-size: 127%;
}
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
index 0f798f9..d7e3564 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
@@ -26,6 +26,11 @@
font-size: 0.8em;
}
+.ve-ui-mwSurfaceWidget .ve-ce-surface {
+ /* 0.875 (mw-body-content) / 0.8em (window) */
+ font-size: 1.09375em;
+}
+
.ve-init-mw-viewPageTarget-toolbar {
margin: -1em -1em 1em -1em;
-webkit-transition: margin 200ms ease-out;
diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css
b/modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css
deleted file mode 100644
index fc1228d..0000000
--- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWSurfaceWidget.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/*!
- * VisualEditor MediaWiki UserInterface MWSurfaceWidget styles.
- *
- * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-.ve-ui-mwSurfaceWidget .ve-ce-surface {
- font-size: 1em;
-}
--
To view, visit https://gerrit.wikimedia.org/r/175222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1607dc77f81ac9c522e09a3b502aeb38fee02178
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
