jenkins-bot has submitted this change and it was merged.
Change subject: Remove wgResourceLoaderLESSImportPaths
......................................................................
Remove wgResourceLoaderLESSImportPaths
Rearrange to use relative paths.
Bug: T140806
Change-Id: Ida6c1ad6a9066d3682dd09ce5a7e16bee961c14e
---
M Flow.php
M modules/editor/editors/visualeditor/mw.flow.ve.Target.less
M modules/styles/board/editor-switcher.less
M modules/styles/board/form-actions.less
M modules/styles/board/header.less
M modules/styles/board/menu.less
M modules/styles/board/moderated.less
M modules/styles/board/navigation.less
M modules/styles/board/replycount.less
M modules/styles/board/terms-of-use.less
M modules/styles/board/timestamps.less
M modules/styles/board/topic/meta.less
M modules/styles/board/topic/post.less
M modules/styles/board/topic/summary.less
M modules/styles/board/topic/titlebar.less
M modules/styles/board/topic/watchlist.less
R modules/styles/flow.colors.less
R modules/styles/flow.variables.less
M
modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less
M modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less
M modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
M modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
M modules/styles/flow/widgets/mw.flow.ui.SidebarExpandWidget.less
M modules/styles/mediawiki.ui/forms.less
M modules/styles/mediawiki.ui/modal.less
M modules/styles/mediawiki.ui/text.less
M modules/styles/mediawiki.ui/tooltips.less
27 files changed, 40 insertions(+), 45 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.php b/Flow.php
index 9ba4ad3..503eb33 100644
--- a/Flow.php
+++ b/Flow.php
@@ -210,11 +210,6 @@
$wgAvailableRights[] = 'flow-edit-post';
$wgAvailableRights[] = 'flow-create-board';
-// Register Flow import paths
-$wgResourceLoaderLESSImportPaths = array_merge(
$wgResourceLoaderLESSImportPaths, array(
- __DIR__ . '/modules/styles/flow.less/',
-) );
-
// Configuration
// URL for more information about the Flow notification system
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
index e6b1576..1995151 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
@import 'mediawiki.ui/variables';
-@import 'flow.variables';
+@import '../../../styles/flow.variables';
// TODO most of this should move to VisualEditorWidget.less once the old
editor system
// has been removed
diff --git a/modules/styles/board/editor-switcher.less
b/modules/styles/board/editor-switcher.less
index b690b07..1226c65 100644
--- a/modules/styles/board/editor-switcher.less
+++ b/modules/styles/board/editor-switcher.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
@import 'mediawiki.ui/variables';
-@import 'flow.colors';
+@import '../flow.colors';
.flow-editor {
background-color: #fff;
diff --git a/modules/styles/board/form-actions.less
b/modules/styles/board/form-actions.less
index 8dd6a67..97aa7e0 100644
--- a/modules/styles/board/form-actions.less
+++ b/modules/styles/board/form-actions.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../flow.colors';
+@import '../flow.variables';
.flow-form-collapsible.flow-form-collapsible-collapsed {
display: none;
diff --git a/modules/styles/board/header.less b/modules/styles/board/header.less
index 29a7ef0..11eda49 100644
--- a/modules/styles/board/header.less
+++ b/modules/styles/board/header.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../flow.colors';
+@import '../flow.variables';
.flow-board-header {
word-break: break-word;
diff --git a/modules/styles/board/menu.less b/modules/styles/board/menu.less
index bf6ec1c..02d5b3c 100644
--- a/modules/styles/board/menu.less
+++ b/modules/styles/board/menu.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.variables';
-@import 'flow.colors';
+@import '../flow.variables';
+@import '../flow.colors';
// @todo document flow-menu
.flow-menu {
diff --git a/modules/styles/board/moderated.less
b/modules/styles/board/moderated.less
index d1d0db7..808fc7b 100644
--- a/modules/styles/board/moderated.less
+++ b/modules/styles/board/moderated.less
@@ -1,5 +1,5 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
+@import '../flow.colors';
// Visually mark locked topics
.flow-topic-moderatestate-lock {
diff --git a/modules/styles/board/navigation.less
b/modules/styles/board/navigation.less
index 4c36041..e88e4b9 100644
--- a/modules/styles/board/navigation.less
+++ b/modules/styles/board/navigation.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../flow.colors';
+@import '../flow.variables';
// Top board navigation bar
.flow-board-navigation {
diff --git a/modules/styles/board/replycount.less
b/modules/styles/board/replycount.less
index 23b3cff..124f320 100644
--- a/modules/styles/board/replycount.less
+++ b/modules/styles/board/replycount.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../flow.colors';
+@import '../flow.variables';
// Reply count (only visible in compact mode)
.flow-reply-count {
diff --git a/modules/styles/board/terms-of-use.less
b/modules/styles/board/terms-of-use.less
index a955fc6..a9daf52 100644
--- a/modules/styles/board/terms-of-use.less
+++ b/modules/styles/board/terms-of-use.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../flow.colors';
+@import '../flow.variables';
// @todo: Give more generic name
// TOU should be tiny and grey
diff --git a/modules/styles/board/timestamps.less
b/modules/styles/board/timestamps.less
index c271980..7914fb7 100644
--- a/modules/styles/board/timestamps.less
+++ b/modules/styles/board/timestamps.less
@@ -1,5 +1,5 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
+@import '../flow.colors';
.flow-timestamp {
.box-sizing( border-box );
diff --git a/modules/styles/board/topic/meta.less
b/modules/styles/board/topic/meta.less
index 6e43c35..7cd6d42 100644
--- a/modules/styles/board/topic/meta.less
+++ b/modules/styles/board/topic/meta.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../../flow.colors';
+@import '../../flow.variables';
// Topic metadata
.flow-topic-meta {
diff --git a/modules/styles/board/topic/post.less
b/modules/styles/board/topic/post.less
index c66dc0a..bd8326a 100644
--- a/modules/styles/board/topic/post.less
+++ b/modules/styles/board/topic/post.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../../flow.colors';
+@import '../../flow.variables';
@highlightedIndent: 0.2em;
diff --git a/modules/styles/board/topic/summary.less
b/modules/styles/board/topic/summary.less
index e0878fd..332d69e 100644
--- a/modules/styles/board/topic/summary.less
+++ b/modules/styles/board/topic/summary.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../../flow.colors';
+@import '../../flow.variables';
.flow-topic-summary-container {
.flow-topic-summary,
diff --git a/modules/styles/board/topic/titlebar.less
b/modules/styles/board/topic/titlebar.less
index 285ecbc..7649aa1 100644
--- a/modules/styles/board/topic/titlebar.less
+++ b/modules/styles/board/topic/titlebar.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../../flow.colors';
+@import '../../flow.variables';
// Show that the topic titlebar is clickable
.flow-topic-titlebar {
diff --git a/modules/styles/board/topic/watchlist.less
b/modules/styles/board/topic/watchlist.less
index 2310a60..35caf85 100644
--- a/modules/styles/board/topic/watchlist.less
+++ b/modules/styles/board/topic/watchlist.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../../flow.colors';
+@import '../../flow.variables';
.flow-watch-link {
position: absolute;
diff --git a/modules/styles/flow.less/flow.colors.less
b/modules/styles/flow.colors.less
similarity index 100%
rename from modules/styles/flow.less/flow.colors.less
rename to modules/styles/flow.colors.less
diff --git a/modules/styles/flow.less/flow.variables.less
b/modules/styles/flow.variables.less
similarity index 100%
rename from modules/styles/flow.less/flow.variables.less
rename to modules/styles/flow.variables.less
diff --git
a/modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less
b/modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less
index fc973d8..a69b5dc 100644
---
a/modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less
+++
b/modules/styles/flow/widgets/editor/editors/mw.flow.ui.WikitextEditorWidget.less
@@ -1,5 +1,5 @@
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../../../../flow.colors';
+@import '../../../../flow.variables';
.flow-ui-wikitextEditorWidget {
position: relative;
diff --git
a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less
b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less
index 78ca5df..f645f06 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.EditorSwitcherWidget.less
@@ -1,5 +1,5 @@
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../../../flow.colors';
+@import '../../../flow.variables';
.flow-ui-editorSwitcherWidget {
display: block;
diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
index e9a2823..3a49125 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
@@ -1,7 +1,7 @@
@import 'mediawiki.mixins';
@import 'mediawiki.ui/variables';
-@import 'flow.variables';
-@import 'flow.colors';
+@import '../../../flow.variables';
+@import '../../../flow.colors';
.flow-component {
.ve-init-target {
diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
index 94943cb..113074c 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less
@@ -1,7 +1,7 @@
@import 'mediawiki.mixins';
@import 'mediawiki.ui/variables';
-@import 'flow.variables';
-@import 'flow.colors';
+@import '../../../flow.variables';
+@import '../../../flow.colors';
.flow-component {
.ve-init-target {
diff --git a/modules/styles/flow/widgets/mw.flow.ui.SidebarExpandWidget.less
b/modules/styles/flow/widgets/mw.flow.ui.SidebarExpandWidget.less
index fd60d38..01a52f0 100644
--- a/modules/styles/flow/widgets/mw.flow.ui.SidebarExpandWidget.less
+++ b/modules/styles/flow/widgets/mw.flow.ui.SidebarExpandWidget.less
@@ -1,4 +1,4 @@
-@import 'flow.variables';
+@import '../../flow.variables';
.flow-ui-sidebarExpandWidget {
display: none;
diff --git a/modules/styles/mediawiki.ui/forms.less
b/modules/styles/mediawiki.ui/forms.less
index 6a52063..ad99f9b 100644
--- a/modules/styles/mediawiki.ui/forms.less
+++ b/modules/styles/mediawiki.ui/forms.less
@@ -1,6 +1,6 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
-@import 'flow.variables';
+@import '../flow.colors';
+@import '../flow.variables';
// Form elements [Draft]
//
diff --git a/modules/styles/mediawiki.ui/modal.less
b/modules/styles/mediawiki.ui/modal.less
index 6664f10..8b2ab17 100644
--- a/modules/styles/mediawiki.ui/modal.less
+++ b/modules/styles/mediawiki.ui/modal.less
@@ -1,5 +1,5 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
+@import '../flow.colors';
.flow-ui-modal {
.box-sizing( border-box );
diff --git a/modules/styles/mediawiki.ui/text.less
b/modules/styles/mediawiki.ui/text.less
index 287a73d..7e18b60 100644
--- a/modules/styles/mediawiki.ui/text.less
+++ b/modules/styles/mediawiki.ui/text.less
@@ -1,5 +1,5 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
+@import '../flow.colors';
.flow-ui-text-truncated {
white-space: nowrap;
diff --git a/modules/styles/mediawiki.ui/tooltips.less
b/modules/styles/mediawiki.ui/tooltips.less
index 6e4e184..5674376 100644
--- a/modules/styles/mediawiki.ui/tooltips.less
+++ b/modules/styles/mediawiki.ui/tooltips.less
@@ -1,5 +1,5 @@
@import 'mediawiki.mixins';
-@import 'flow.colors';
+@import '../flow.colors';
/*
Tooltips
--
To view, visit https://gerrit.wikimedia.org/r/322387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida6c1ad6a9066d3682dd09ce5a7e16bee961c14e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: Mooeypoo <mor...@gmail.com>
Gerrit-Reviewer: Sarahhaskins <sa...@frenchfrieswithpepper.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
