Merge branch 'minify' into 0.9.x

1 files changed, 48 insertions, 0 deletions

diff --git a/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css
new file mode 100644
index 000000000..1e4358c25
--- /dev/null
+++ b/plugins/Minify/extlib/minify/min_unit_tests/_test_files/importProcessor/output.css
@@ -0,0 +1,48 @@
+@media screen {
+/* some CSS to try to exercise things in general */
+
+@import     url(/more.css);
+
+    body, td, th {
+        font-family: Verdana , "Bitstream Vera Sans" , sans-serif ;
+
+	font-size  : 12px;
+}
+
+.nav {
+    margin-left: 20%;
+}
+#main-nav {
+    background-color: red;
+    border: 1px solid #00ff77;
+}
+
+div#content 
+h1 + p {
+    padding-top: 0;
+    margin-top: 0;
+}
+
+@media all and (min-width: 640px) {
+	#media-queries-1 { background-color: #0f0; }
+}	
+
+@media screen and (max-width: 2000px) {
+	#media-queries-2 { background-color: #0f0; }
+}
+@import url(http://example.com/hello.css);
+adjacent foo { background: red url(/red.gif); }
+adjacent bar { background: url('%TEST_FILES_URI%/green.gif') }
+}
+
+@media tv,projection {
+/* @import url('%TEST_FILES_URI%/importProcessor/1/bad.css') bad; */
+adjacent2 foo { background: red url(/red.gif); }
+adjacent2 bar { background: url('%TEST_FILES_URI%/importProcessor/green.gif') }
+@import '../input.css';
+tv foo { background: red url(/red.gif); }
+tv bar { background: url('%TEST_FILES_URI%/importProcessor/green.gif') }
+}
+
+input foo { background: red url(/red.gif); }
+input bar { background: url('%TEST_FILES_URI%/green.gif') }
\ No newline at end of file