From 6803aa677ef2951e40a9002775d6cb4b48dc412d Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Wed, 9 Jul 2014 11:12:13 -0700
Subject: [PATCH] Allow importing of LESS from MediaWiki.UI

This allows Flow to reuse colors defined here.
See: I519beb8b0ffae0bef387cefa5026ee94282001df

Change-Id: I68cd4de1df515cf059a1d9e45cd3ff801a0a1c84
---
 .../settings => mediawiki.less/mediawiki.ui}/colors.less    | 0
 .../{ => mediawiki.less}/mediawiki.ui/mixins/effects.less   | 2 +-
 .../src/{ => mediawiki.less}/mediawiki.ui/mixins/forms.less | 2 +-
 .../src/{ => mediawiki.less}/mediawiki.ui/mixins/type.less  | 2 +-
 .../{ => mediawiki.less}/mediawiki.ui/mixins/utilities.less | 0
 .../mediawiki.ui}/typography.less                           | 0
 resources/src/mediawiki.ui/components/default/buttons.less  | 6 +++---
 resources/src/mediawiki.ui/components/default/forms.less    | 4 ++--
 resources/src/mediawiki.ui/components/utilities.less        | 2 +-
 resources/src/mediawiki.ui/components/vector/buttons.less   | 2 +-
 .../src/mediawiki.ui/components/vector/containers.less      | 2 +-
 resources/src/mediawiki.ui/components/vector/forms.less     | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
 rename resources/src/{mediawiki.ui/settings => mediawiki.less/mediawiki.ui}/colors.less (100%)
 rename resources/src/{ => mediawiki.less}/mediawiki.ui/mixins/effects.less (98%)
 rename resources/src/{ => mediawiki.less}/mediawiki.ui/mixins/forms.less (97%)
 rename resources/src/{ => mediawiki.less}/mediawiki.ui/mixins/type.less (69%)
 rename resources/src/{ => mediawiki.less}/mediawiki.ui/mixins/utilities.less (100%)
 rename resources/src/{mediawiki.ui/settings => mediawiki.less/mediawiki.ui}/typography.less (100%)

diff --git a/resources/src/mediawiki.ui/settings/colors.less b/resources/src/mediawiki.less/mediawiki.ui/colors.less
similarity index 100%
rename from resources/src/mediawiki.ui/settings/colors.less
rename to resources/src/mediawiki.less/mediawiki.ui/colors.less
diff --git a/resources/src/mediawiki.ui/mixins/effects.less b/resources/src/mediawiki.less/mediawiki.ui/mixins/effects.less
similarity index 98%
rename from resources/src/mediawiki.ui/mixins/effects.less
rename to resources/src/mediawiki.less/mediawiki.ui/mixins/effects.less
index 9759f63469..8561582c62 100644
--- a/resources/src/mediawiki.ui/mixins/effects.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins/effects.less
@@ -1,4 +1,4 @@
-@import "../settings/colors";
+@import "mediawiki.ui/colors";
 // ----------------------------------------------------------------------------
 // Button styling
 // ----------------------------------------------------------------------------
diff --git a/resources/src/mediawiki.ui/mixins/forms.less b/resources/src/mediawiki.less/mediawiki.ui/mixins/forms.less
similarity index 97%
rename from resources/src/mediawiki.ui/mixins/forms.less
rename to resources/src/mediawiki.less/mediawiki.ui/mixins/forms.less
index 20f42a01fa..6b04061b38 100644
--- a/resources/src/mediawiki.ui/mixins/forms.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins/forms.less
@@ -1,4 +1,4 @@
-@import "../settings/colors";
+@import "mediawiki.ui/colors";
 
 // Font is not included.
 // For Vector, that should be layered on top with vector-type
diff --git a/resources/src/mediawiki.ui/mixins/type.less b/resources/src/mediawiki.less/mediawiki.ui/mixins/type.less
similarity index 69%
rename from resources/src/mediawiki.ui/mixins/type.less
rename to resources/src/mediawiki.less/mediawiki.ui/mixins/type.less
index 4a0116825b..bf80ccb167 100644
--- a/resources/src/mediawiki.ui/mixins/type.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins/type.less
@@ -1,4 +1,4 @@
-@import "../settings/typography";
+@import "mediawiki.ui/typography";
 
 .vector-type() {
 	font-size: @baseFontSize;
diff --git a/resources/src/mediawiki.ui/mixins/utilities.less b/resources/src/mediawiki.less/mediawiki.ui/mixins/utilities.less
similarity index 100%
rename from resources/src/mediawiki.ui/mixins/utilities.less
rename to resources/src/mediawiki.less/mediawiki.ui/mixins/utilities.less
diff --git a/resources/src/mediawiki.ui/settings/typography.less b/resources/src/mediawiki.less/mediawiki.ui/typography.less
similarity index 100%
rename from resources/src/mediawiki.ui/settings/typography.less
rename to resources/src/mediawiki.less/mediawiki.ui/typography.less
diff --git a/resources/src/mediawiki.ui/components/default/buttons.less b/resources/src/mediawiki.ui/components/default/buttons.less
index dce4cd04d2..cc8212fe10 100644
--- a/resources/src/mediawiki.ui/components/default/buttons.less
+++ b/resources/src/mediawiki.ui/components/default/buttons.less
@@ -1,7 +1,7 @@
 @import "mediawiki.mixins";
-@import "../../settings/typography";
-@import "../../mixins/effects";
-@import "../../mixins/utilities";
+@import "mediawiki.ui/typography";
+@import "mediawiki.ui/mixins/effects";
+@import "mediawiki.ui/mixins/utilities";
 
 // Buttons
 //
diff --git a/resources/src/mediawiki.ui/components/default/forms.less b/resources/src/mediawiki.ui/components/default/forms.less
index 6c40c266f4..1a84afd286 100644
--- a/resources/src/mediawiki.ui/components/default/forms.less
+++ b/resources/src/mediawiki.ui/components/default/forms.less
@@ -1,8 +1,8 @@
 // Form elements and layouts
 
 @import "mediawiki.mixins";
-@import "../../mixins/utilities";
-@import "../../mixins/forms";
+@import "mediawiki.ui/mixins/utilities";
+@import "mediawiki.ui/mixins/forms";
 
 // --------------------------------------------------------------------------
 // Layouts
diff --git a/resources/src/mediawiki.ui/components/utilities.less b/resources/src/mediawiki.ui/components/utilities.less
index 9aea429144..dd26cdda91 100644
--- a/resources/src/mediawiki.ui/components/utilities.less
+++ b/resources/src/mediawiki.ui/components/utilities.less
@@ -4,7 +4,7 @@
 // Positioning
 // --------------------------------------------------------------------------
 
-@import "../mixins/utilities";
+@import "mediawiki.ui/mixins/utilities";
 
 .mw-ui-flush-left {
 	.agora-flush-left();
diff --git a/resources/src/mediawiki.ui/components/vector/buttons.less b/resources/src/mediawiki.ui/components/vector/buttons.less
index 15363384d5..967b193636 100644
--- a/resources/src/mediawiki.ui/components/vector/buttons.less
+++ b/resources/src/mediawiki.ui/components/vector/buttons.less
@@ -1,5 +1,5 @@
 @import "../default/buttons"; // Layer Vector on top of the default settings.
-@import "../../mixins/type";
+@import "mediawiki.ui/mixins/type";
 
 .mw-ui-button {
 	.vector-type();
diff --git a/resources/src/mediawiki.ui/components/vector/containers.less b/resources/src/mediawiki.ui/components/vector/containers.less
index 1e9ec05c58..6db4675ee2 100644
--- a/resources/src/mediawiki.ui/components/vector/containers.less
+++ b/resources/src/mediawiki.ui/components/vector/containers.less
@@ -1,5 +1,5 @@
 // No default settings for containers yet.
-@import "../../mixins/type";
+@import "mediawiki.ui/mixins/type";
 
 .mw-ui-container {
 	.vector-type();
diff --git a/resources/src/mediawiki.ui/components/vector/forms.less b/resources/src/mediawiki.ui/components/vector/forms.less
index 2bbd8f0dbe..139ee6caf9 100644
--- a/resources/src/mediawiki.ui/components/vector/forms.less
+++ b/resources/src/mediawiki.ui/components/vector/forms.less
@@ -1,5 +1,5 @@
 @import "../default/forms"; // Layer Vector on top of the default settings.
-@import "../../mixins/type";
+@import "mediawiki.ui/mixins/type";
 
 .mw-ui-vform,
 .mw-ui-vform input,
-- 
2.20.1