fix tests

This commit is contained in:
Luke Page
2013-07-15 22:03:52 +01:00
parent a554b8e088
commit 037cdb5916
12 changed files with 15 additions and 17 deletions

View File

@@ -1,6 +1,6 @@
(function (tree) {
tree.debugInfo = function(env, ctx) {
tree.debugInfo = function(env, ctx, lineSeperator) {
var result="";
if (env.dumpLineNumbers && !env.compress) {
switch(env.dumpLineNumbers) {
@@ -11,7 +11,7 @@ tree.debugInfo = function(env, ctx) {
result = tree.debugInfo.asMediaQuery(ctx);
break;
case 'all':
result = tree.debugInfo.asComment(ctx)+tree.debugInfo.asMediaQuery(ctx);
result = tree.debugInfo.asComment(ctx) + (lineSeperator || "") + tree.debugInfo.asMediaQuery(ctx);
break;
}
}

View File

@@ -55,7 +55,7 @@ tree.Import.prototype = {
var features = this.features ? ' ' + this.features.toCSS(env) : '';
if (this.css) {
return "@import " + this.path.toCSS() + features + ';\n';
return "@import " + this.path.toCSS() + features + ';';
} else {
return "";
}

View File

@@ -246,7 +246,7 @@ tree.Ruleset.prototype = {
}
} else {
if (rules.length > 0) {
debugInfo = tree.debugInfo(env, this);
debugInfo = tree.debugInfo(env, this, tabSetStr);
selector = this.paths
.map(function (p) {
return p.map(function (s) {

View File

@@ -1,5 +1,4 @@
@import "https://www.github.com/cloudhead/imports/modify-this.css";
@import "https://www.github.com/cloudhead/imports/modify-again.css";
.modify {
my-url: url("https://www.github.com/cloudhead/imports/a.png");

View File

@@ -1,5 +1,4 @@
@import "http://localhost:8081/browser/less/modify-this.css";
@import "http://localhost:8081/browser/less/modify-again.css";
.modify {
my-url: url("http://localhost:8081/browser/less/a.png");

View File

@@ -32,7 +32,6 @@
color: red;
/* A C-style comment */
/* A C-style comment */
background-color: orange;
font-size: 12px;
/* lost comment */
@@ -59,7 +58,12 @@
#last {
color: #0000ff;
}
/* *//* { *//* *//* *//* */#div {
/* */
/* { */
/* */
/* */
/* */
#div {
color: #A33;
}
/* } */

View File

@@ -1,5 +1,4 @@
#colours{color1:#fea;color2:#fea;color3:rgba(255,238,170,0.1);string:"#ffeeaa";/*! but not this type
Note preserved whitespace
*/
}
*/}
dimensions{val:.1px;val:0;val:4cm;val:.2;val:5;angles-must-have-unit:0deg;width:auto\9}

View File

@@ -1,3 +1,5 @@
this isn't very valid CSS. @media (min-width: 600px) {
this isn't very valid CSS.
@media (min-width: 600px) {
#css { color: yellow; }
}

2
test/css/import.css vendored
View File

@@ -1,7 +1,5 @@
@import url(http://fonts.googleapis.com/css?family=Open+Sans);
@import url(/absolute/something.css) screen and (color) and (max-width: 600px);
@import url("//ha.com/file.css") (min-width: 100px);
#import-test {
height: 10px;

View File

@@ -1,5 +1,4 @@
@import "folder (1)/../css/background.css";
@import "folder (1)/import-test-d.css";
@font-face {
src: url("/fonts/garamond-pro.ttf");

View File

@@ -1,7 +1,5 @@
@import "import/../css/background.css";
@import "import/import-test-d.css";
@import "file.css";
@font-face {
src: url("/fonts/garamond-pro.ttf");

View File

@@ -1 +1 @@
this isn't very valid CSS.
this isn't very valid CSS.