Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/114643
Change subject: Revert "Converting ViewPageTarget CSS files to LESS"
......................................................................
Revert "Converting ViewPageTarget CSS files to LESS"
We don't yet have any way to test or verify anything with less. Not the less
syntax, not the less compilation, not the resulting css code quality.
Using it at this point doesn't seem worth the cost of not having any of that.
This reverts commit 17ddf031fef597795f7c32ededfe10bcaf6b41bc.
Change-Id: I7e8ab90f7a9f77f5cf6d7baeab586d4e0332042e
---
M VisualEditor.php
R modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css
R modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
A modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css
D modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.less
R modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
R modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
R modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-raster.css
R modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-vector.css
R modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
R modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.css
R modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.noscript.css
12 files changed, 88 insertions(+), 104 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/43/114643/1
diff --git a/VisualEditor.php b/VisualEditor.php
index 1b4f3e8..401f43e 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -118,21 +118,21 @@
'ext.visualEditor.viewPageTarget.icons-raster' =>
$wgVisualEditorResourceTemplate + array(
'styles' => array(
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-raster.less',
+
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-raster.css',
),
'targets' => array( 'desktop', 'mobile' ),
),
'ext.visualEditor.viewPageTarget.icons-vector' =>
$wgVisualEditorResourceTemplate + array(
'styles' => array(
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-vector.less',
+
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-vector.css',
),
'targets' => array( 'desktop', 'mobile' ),
),
'ext.visualEditor.viewPageTarget.init' =>
$wgVisualEditorResourceTemplate + array(
'scripts' =>
'modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js',
- 'styles' =>
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.less',
+ 'styles' =>
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.css',
'dependencies' => array(
'jquery.client',
'mediawiki.Title',
@@ -154,7 +154,7 @@
),
'ext.visualEditor.viewPageTarget.noscript' =>
$wgVisualEditorResourceTemplate + array(
- 'styles' =>
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.noscript.less',
+ 'styles' =>
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.noscript.css',
),
'ext.visualEditor.viewPageTarget' => $wgVisualEditorResourceTemplate +
array(
@@ -162,23 +162,23 @@
'modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js',
),
'styles' => array(
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.less',
+
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css',
),
'skinStyles' => array(
'vector' => array(
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.less',
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.less',
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.less' => 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.less',
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.less',
+
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css',
+
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css',
),
'monobook' => array(
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.less',
-
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.less',
+
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css',
+
'modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css',
)
),
'dependencies' => array(
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css
similarity index 84%
rename from modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.less
rename to modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css
index ffcb0b5..6c5cbaa 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.less
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css
@@ -13,10 +13,10 @@
margin: -0.6em -3em 0.8em -3em;
position: relative;
font-size: 1.3em;
+}
- .oo-ui-toolbar-bar {
- line-height: 1.5em;
- }
+.ve-init-mw-viewPageTarget-toolbar .oo-ui-toolbar-bar {
+ line-height: 1.5em;
}
.oo-ui-menuWidget-item:hover {
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
similarity index 100%
rename from modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.less
rename to modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css
new file mode 100644
index 0000000..0290e39
--- /dev/null
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.css
@@ -0,0 +1,49 @@
+/*!
+ * VisualEditor MediaWiki Initialization ViewPageTarget shared styles.
+ * These are styles that are common to the vector, monobook, and apex skins,
but may not
+ * be applied to other skins (for example, minerva).
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/* ve.ce.MWBlockImageNode */
+
+figure[typeof*='mw:Image'] {
+ margin: 0;
+}
+
+figure[typeof*='mw:Image'] a {
+ border: 0;
+}
+
+/* TODO: Merge with div.tright styles */
+/* Due to a weird cssjanus bug, noflip rules
+ are set as single-rules rather than for the
+ whole class */
+figure[typeof*='mw:Image'].mw-halign-right {
+ /* @noflip */
+ margin: .5em 0 1.3em 1.4em;
+}
+
+/* TODO: Merge with div.tleft styles */
+/* Due to a weird cssjanus bug, noflip rules
+ are set as single-rules rather than for the
+ whole class */
+figure[typeof*='mw:Image'].mw-halign-left {
+ /* @noflip */
+ margin: .5em 1.4em 1.3em 0;
+}
+
+/* TODO: Merge with div.thumbinner styles */
+figure[typeof='mw:Image/Thumb'], figure[typeof='mw:Image/Frame'] {
+ background-color: #f9f9f9;
+ border: 1px solid #cccccc;
+ padding: 3px !important;
+ font-size: 94%;
+}
+
+/* TODO: Merge with .thumbimage styles */
+figure[typeof*='mw:Image'] .ve-ce-mwBlockImageNode-thumbimage {
+ border: 1px solid #cccccc;
+}
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.less
deleted file mode 100644
index c34d1e9..0000000
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-shared.less
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
- * VisualEditor MediaWiki Initialization ViewPageTarget shared styles.
- * These are styles that are common to the vector, monobook, and apex skins,
but may not
- * be applied to other skins (for example, minerva).
- *
- * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/* ve.ce.MWBlockImageNode */
-
-figure[typeof*='mw:Image'] {
- margin: 0;
-
- a {
- border: 0;
- }
-
- /* TODO: Merge with .thumbimage styles */
- .ve-ce-mwBlockImageNode-thumbimage {
- border: 1px solid #cccccc;
- }
-
- /* TODO: Merge with div.tright styles */
- /* Due to a weird cssjanus bug, noflip rules
- are set as single-rules rather than for the
- whole class */
- &.mw-halign-right {
- /* @noflip */
- margin: .5em 0 1.3em 1.4em;
- }
-
- &.mw-halign-center {
- margin-left: auto;
- margin-right: auto;
- }
-
- /* TODO: Merge with div.tleft styles */
- /* Due to a weird cssjanus bug, noflip rules
- are set as single-rules rather than for the
- whole class */
- &.mw-halign-left {
- /* @noflip */
- margin: .5em 1.4em 1.3em 0;
- }
-}
-
-/* TODO: Merge with div.thumbinner styles */
-figure[typeof='mw:Image/Thumb'], figure[typeof='mw:Image/Frame'] {
- background-color: #f9f9f9;
- border: 1px solid #cccccc;
- padding: 3px !important;
- font-size: 94%;
-}
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
similarity index 100%
rename from modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.less
rename to modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector-hd.css
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
similarity index 76%
rename from modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.less
rename to modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
index 66e71ad..5fc21e1 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.less
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css
@@ -7,15 +7,15 @@
.ve-init-mw-viewPageTarget-surface {
margin: 0.8em -1.5em 0 -1.5em;
+}
- .ve-ce-documentNode {
- font-size: 0.8em;
- padding: 0 1.875em; /* 1.5/0.8 */
- }
+.ve-init-mw-viewPageTarget-surface .ve-ce-documentNode {
+ font-size: 0.8em;
+ padding: 0 1.875em; /* 1.5/0.8 */
+}
- .oo-ui-menuWidget {
- font-size: 0.8em;
- }
+.ve-init-mw-viewPageTarget-surface .oo-ui-menuWidget {
+ font-size: 0.8em;
}
.ve-init-mw-viewPageTarget-toolbar {
diff --git
a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-raster.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-raster.css
similarity index 100%
rename from
modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-raster.less
rename to modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-raster.css
diff --git
a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-vector.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-vector.css
similarity index 100%
rename from
modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-vector.less
rename to modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.Icons-vector.css
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
similarity index 81%
rename from modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.less
rename to modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 995e65f..6abe4a8 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.less
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -5,10 +5,6 @@
* @license The MIT License (MIT); see LICENSE.txt
*/
-.surface, .ve-ui-surface {
- background-color: green !important;
-}
-
/* VisualEditor */
.ve-init-mw-viewPageTarget-transform {
@@ -34,32 +30,27 @@
/* Toolbar */
+.ve-init-mw-viewPageTarget-toolbar-utilites,
.ve-init-mw-viewPageTarget-toolbar-actions {
display: inline-block;
vertical-align: middle;
+}
+
+.ve-init-mw-viewPageTarget-toolbar-actions {
font-size: 0.8em;
vertical-align: top;
padding: 0.25em;
-
- > .oo-ui-buttonedElement-framed {
- margin-left: 0.25em;
- margin-right: 0.25em;
- margin-top: 0.2em;
- }
}
-.ve-init-mw-viewPageTarget-toolbar-utilites {
- display: inline-block;
- vertical-align: middle;
-
- > .oo-ui-buttonedElement-frameless {
- margin-right: 0.2em;
- margin-top: 0.2em;
- }
+.ve-init-mw-viewPageTarget-toolbar-utilites > .oo-ui-buttonedElement-frameless
{
+ margin-right: 0.2em;
+ margin-top: 0.2em;
}
-.ve-init-mw-viewPageTarget-toolbar-actions {
-
+.ve-init-mw-viewPageTarget-toolbar-actions > .oo-ui-buttonedElement-framed {
+ margin-left: 0.25em;
+ margin-right: 0.25em;
+ margin-top: 0.2em;
}
/* Needs to override .oo-ui.widget.oo-ui-widget-disabled */
@@ -112,15 +103,13 @@
margin-top: 0.8em;
}
-.ve-ui-mwHelpPopupTool-item
- > .oo-ui-buttonedElement-frameless {
- display: block;
- margin: 0.5em 0;
- }
+.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonedElement-frameless {
+ display: block;
+ margin: 0.5em 0;
+}
- > .oo-ui-buttonedElement-frameless:first-child {
- margin-top: 0;
- }
+.ve-ui-mwHelpPopupTool-item > .oo-ui-buttonedElement-frameless:first-child {
+ margin-top: 0;
}
.ve-init-mw-ViewPageTarget-version-label,
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.css
similarity index 100%
rename from modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.less
rename to modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.init.css
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.noscript.less
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.noscript.css
similarity index 100%
rename from modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.noscript.less
rename to modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.noscript.css
--
To view, visit https://gerrit.wikimedia.org/r/114643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e8ab90f7a9f77f5cf6d7baeab586d4e0332042e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
