From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 .../tests/inputs/mixin_merging.less.disable        | 100 +++++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 vendor/leafo/lessphp/tests/inputs/mixin_merging.less.disable

(limited to 'vendor/leafo/lessphp/tests/inputs/mixin_merging.less.disable')

diff --git a/vendor/leafo/lessphp/tests/inputs/mixin_merging.less.disable b/vendor/leafo/lessphp/tests/inputs/mixin_merging.less.disable
new file mode 100644
index 00000000..86b3e0cb
--- /dev/null
+++ b/vendor/leafo/lessphp/tests/inputs/mixin_merging.less.disable
@@ -0,0 +1,100 @@
+
+@tester {
+	p, div { height: 10px; }
+}
+
+#test1 {
+	div { color: red; }
+	@tester;
+}
+
+
+@cool {
+	a,b,i { width: 1px; }
+}
+
+#test2 {
+	b { color: red; }
+	@cool;
+}
+
+#test3 {
+	@cool;
+	b { color: red; }
+}
+
+@cooler {
+	a { margin: 1px; }
+}
+
+#test4 {
+	a, div, html { color: blue; }
+	@cooler;
+}
+
+@hi {
+	img, strong { float: right; }
+}
+
+#test5 {
+	img, strong { padding: 2px; }
+	@hi;
+}
+
+@nested {
+	div, span {
+		a {
+			color: red;
+		}
+	}
+}
+
+#test6 {
+	div, span {
+		a {
+			line-height: 10px;
+		}
+	}
+	@nested;
+}
+
+@broken-nesting {
+	div, span {
+		strong, b {
+			color: red;
+		}
+	}
+
+}
+
+#test7 {
+	div {
+		strong {
+			margin: 1px;
+		}
+	}
+	@broken-nesting;
+}
+
+
+@another-nest {
+	a,b {
+		i {
+			color: red;
+		}
+
+		s {
+			color: blue;
+		}
+	}
+}
+
+#test8 {
+	a, b {
+		i,s {
+			background: red;
+		}
+	}
+	@another-nest;
+}
+
-- 
cgit v1.2.2