jenkins-bot has submitted this change and it was merged.
Change subject: Get rid of ve.init.mw.ViewPageTarget-vector-hd.css and use a
media query instead
......................................................................
Get rid of ve.init.mw.ViewPageTarget-vector-hd.css and use a media query instead
This will mean it will be more obvious if making a change to the SD or HD
version
that an equivalent adjustment may be needed.
Change-Id: I6129220839ef55017fe69d723524ecdf6cf0234f
---
M VisualEditor.php
D modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
3 files changed, 23 insertions(+), 31 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index 2bd65e4..8f2ad5f 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -161,9 +161,6 @@
'vector' => array(
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css',
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css',
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css' => array(
- 'media' => 'screen and (min-width:
982px)'
- ),
),
'apex' => array(
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css',
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
deleted file mode 100644
index f58baac..0000000
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
- * VisualEditor MediaWiki Initialization ViewPageTarget Vector skin
high-definition styles.
- *
- * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-.ve-init-mw-viewPageTarget-surface {
- margin: 0.8em -1.5em 0 -1.5em;
-}
-
-.ve-init-mw-viewPageTarget-surface .ve-ce-documentNode {
- padding: 0 1.714em; /* surface-margin-left (1.5em) / (mw-body-content
font-size) 0.875em */
-}
-
-.ve-init-mw-viewPageTarget-toolbar {
- margin: -1.25em -1.5em 1.5em -1.5em;
-}
-
-.ve-ui-debugBar {
- padding: 1.5em;
- margin: 1em -1.5em -1.5em -1.5em;
-}
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 8006d10..0b55bc8 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
@@ -50,11 +50,29 @@
z-index: 101; /* #p-personal is z-index 100 in vector :( */
}
-/*
-Margin override in ve.ce.TableCellnode.css doesn't work due
-to more specific rule in Vector (div#content p)
-*/
+/* ve.ce.TableCellnode.css's margin replaced by more specific rule in Vector
(div#content p) */
/*csslint ids:false */
#content .ve-ce-tableCellNode .ve-ce-paragraphNode {
margin: 0;
-}
\ No newline at end of file
+}
+/*csslint ids:true */
+
+/* High-definition-specific styles (because Vector adds 1em to the leftNav if
width is 982px+ */
+@media screen and (min-width: 982px) {
+ .ve-init-mw-viewPageTarget-surface {
+ margin: 0.8em -1.5em 0 -1.5em;
+ }
+
+ .ve-init-mw-viewPageTarget-surface .ve-ce-documentNode {
+ padding: 0 1.714em; /* surface-margin-left (1.5em) /
(mw-body-content font-size) 0.875em */
+ }
+
+ .ve-init-mw-viewPageTarget-toolbar {
+ margin: -1.25em -1.5em 1.5em -1.5em;
+ }
+
+ .ve-ui-debugBar {
+ padding: 1.5em;
+ margin: 1em -1.5em -1.5em -1.5em;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/142825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6129220839ef55017fe69d723524ecdf6cf0234f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
