less 2.0.8 → 2.0.9

data/lib/less/js/lib/less/tree/ruleset.js

@@ -7,15 +7,17 @@ tree.Ruleset = function (selectors, rules) {
 };
 tree.Ruleset.prototype = {
     eval: function (env) {
-        var ruleset = new(tree.Ruleset)(this.selectors, this.rules.slice(0));
+        var selectors = this.selectors && this.selectors.map(function (s) { return s.eval(env) });
+        var ruleset = new(tree.Ruleset)(selectors, this.rules.slice(0));
 
         ruleset.root = this.root;
+        ruleset.allowImports = this.allowImports;
 
         // push the current ruleset to the frames stack
         env.frames.unshift(ruleset);
 
         // Evaluate imports
-        if (ruleset.root) {
+        if (ruleset.root || ruleset.allowImports) {
             for (var i = 0; i < ruleset.rules.length; i++) {
                 if (ruleset.rules[i] instanceof tree.Import) {
                     Array.prototype.splice
@@ -120,7 +122,7 @@ tree.Ruleset.prototype = {
             if (context.length === 0) {
                 paths = this.selectors.map(function (s) { return [s] });
             } else {
-                this.joinSelectors( paths, context, this.selectors );
+                this.joinSelectors(paths, context, this.selectors);
             }
         }
 
@@ -160,7 +162,8 @@ tree.Ruleset.prototype = {
                     return p.map(function (s) {
                         return s.toCSS(env);
                     }).join('').trim();
-                }).join(env.compress ? ',' : (paths.length > 3 ? ',\n' : ', '));
+                }).join( env.compress ? ',' : ',\n');
+
                 css.push(selector,
                         (env.compress ? '{' : ' {\n  ') +
                         rules.join(env.compress ? '' : '\n  ') +

data/lib/less/js/lib/less/tree/selector.js

@@ -22,6 +22,11 @@ tree.Selector.prototype.match = function (other) {
     }
     return true;
 };
+tree.Selector.prototype.eval = function (env) {
+    return new(tree.Selector)(this.elements.map(function (e) {
+        return e.eval(env);
+    }));
+};
 tree.Selector.prototype.toCSS = function (env) {
     if (this._css) { return this._css }
 

data/lib/less/js/lib/less/tree/variable.js

@@ -1,6 +1,6 @@
 (function (tree) {
 
-tree.Variable = function (name, index) { this.name = name, this.index = index };
+tree.Variable = function (name, index, file) { this.name = name, this.index = index, this.file = file };
 tree.Variable.prototype = {
     eval: function (env) {
         var variable, v, name = this.name;
@@ -15,7 +15,9 @@ tree.Variable.prototype = {
             }
         })) { return variable }
         else {
-            throw { message: "variable " + name + " is undefined",
+            throw { type: 'Name',
+                    message: "variable " + name + " is undefined",
+                    filename: this.file,
                     index: this.index };
         }
     }

data/lib/less/js/package.json

@@ -5,7 +5,7 @@
   "keywords"      : ["css", "parser", "lesscss", "browser"],
   "author"        : "Alexis Sellier <self@cloudhead.net>",
   "contributors"  : [],
-  "version"       : "1.1.5",
+  "version"       : "1.2.1",
   "bin"           : { "lessc": "./bin/lessc" },
   "main"          : "./lib/less/index",
   "directories"   : { "test": "./test" },

data/lib/less/js/test/css/colors.css

@@ -46,3 +46,13 @@
 #00ff00 {
   color: #00ff00;
 }
+.lightenblue {
+  color: #3333ff;
+}
+.darkenblue {
+  color: #0000cc;
+}
+.unknowncolors {
+  color: blue2;
+  border: 2px solid superred;
+}

data/lib/less/js/test/css/comments.css

@@ -8,9 +8,9 @@
     Comment
 
 */
-/*  
+/*
  * Comment Test
- * 
+ *
  * - cloudhead (http://cloudhead.net)
  *
  */
@@ -44,9 +44,13 @@
     color: grey;
   }
 */
-.selector, .lots, .comments {
-  color: grey, /* blue */ orange;
+.selector,
+.lots,
+.comments {
+  color: #808080, /* blue */ #ffa500;
+  -webkit-border-radius: 2px /* webkit only */;
+  -moz-border-radius: 8px /* moz only with operation */;
 }
 #last {
-  color: blue;
+  color: #0000ff;
 }

data/lib/less/js/test/css/css-3.css

@@ -1,6 +1,6 @@
 .comma-delimited {
   background: url(bg.jpg) no-repeat, url(bg.png) repeat-x top left, url(bg);
-  text-shadow: -1px -1px 1px red, 6px 5px 5px yellow;
+  text-shadow: -1px -1px 1px #ff0000, 6px 5px 5px #ffff00;
   -moz-box-shadow: 0pt 0pt 2px rgba(255, 255, 255, 0.4) inset, 0pt 4px 6px rgba(255, 255, 255, 0.4) inset;
 }
 @font-face {
@@ -25,7 +25,9 @@ ul.comma > li:not(:only-child)::after {
 ol.comma > li:nth-last-child(2)::after {
   color: white;
 }
-li:nth-child(4n+1), li:nth-child(-5n), li:nth-child(-n+2) {
+li:nth-child(4n+1),
+li:nth-child(-5n),
+li:nth-child(-n+2) {
   color: white;
 }
 a[href^="http://"] {

data/lib/less/js/test/css/css-escapes.css

@@ -8,7 +8,7 @@
   background: red;
 }
 .\34 04 strong {
-  color: fuchsia;
+  color: #ff00ff;
   font-weight: bold;
 }
 .trailingTest\+ {

data/lib/less/js/test/css/css.css

@@ -8,7 +8,9 @@ div {
 * {
   min-width: 45em;
 }
-h1, h2 > a > p, h3 {
+h1,
+h2 > a > p,
+h3 {
   color: none;
 }
 div.class {
@@ -33,10 +35,12 @@ div#id {
   font-family: 'Garamond Pro';
   src: url("/fonts/garamond-pro.ttf");
 }
-a:hover, a:link {
+a:hover,
+a:link {
   color: #999;
 }
-p, p:first-child {
+p,
+p:first-child {
   text-transform: none;
 }
 q:lang(no) {
@@ -64,7 +68,7 @@ p + h1 {
   width: .1em;
   background-color: #009998;
   background-image: url(images/image.jpg);
-  background: -webkit-gradient(linear, left top, left bottom, from(red), to(blue));
+  background: -webkit-gradient(linear, left top, left bottom, from(#ff0000), to(#0000ff));
   margin: ;
   filter: alpha(opacity=100);
 }

data/lib/less/js/test/css/functions.css

@@ -24,6 +24,19 @@
   lightness: 95%;
   rounded: 11;
   roundedpx: 3px;
+  percentage: 20%;
+  color: #ff0011;
+}
+#built-in .is-a {
+  color: true;
+  color: true;
+  color: true;
+  keyword: true;
+  number: true;
+  string: true;
+  pixel: true;
+  percent: true;
+  em: true;
 }
 #alpha {
   alpha: rgba(153, 94, 51, 0.6);

data/lib/less/js/test/css/import.css

@@ -1,16 +1,23 @@
 @import "import-test-d.css";
 
 @import url(http://fonts.googleapis.com/css?family=Open+Sans);
+
+@import url(something.css) screen and (color) and (max-width: 600px);
 #import {
-  color: red;
+  color: #ff0000;
 }
 .mixin {
   height: 10px;
-  color: red;
+  color: #ff0000;
 }
 #import-test {
   height: 10px;
-  color: red;
+  color: #ff0000;
   width: 10px;
   height: 30%;
 }
+@media screen and (max-width: 600px) {
+  body {
+    width: 100%;
+  }
+}

data/lib/less/js/test/css/media.css

@@ -5,7 +5,8 @@
   .class .sub {
     width: 42;
   }
-  .top, header > h1 {
+  .top,
+  header > h1 {
     color: #444444;
   }
 }
@@ -14,8 +15,13 @@
     max-width: 480;
   }
 }
-@media all and (orientation:portrait) {
+@media all and (orientation: portrait) {
   aside {
     float: none;
   }
 }
+@media handheld and (min-width: 42), screen and (min-width: 20em) {
+  body {
+    max-width: 480px;
+  }
+}

data/lib/less/js/test/css/mixins-args.css

@@ -6,7 +6,7 @@
   color: blue;
   width: 10px;
   height: 99%;
-  border: 2px dotted black;
+  border: 2px dotted #000000;
 }
 .one-arg {
   width: 15px;
@@ -54,8 +54,11 @@ body {
   color: red;
 }
 .arguments {
-  border: 1px solid black;
+  border: 1px solid #000000;
 }
 .arguments2 {
   border: 0px;
 }
+.edge-case {
+  border: "{";
+}

data/lib/less/js/test/css/mixins-guards.css

@@ -0,0 +1,58 @@
+.light1 {
+  color: white;
+  margin: 1px;
+}
+.light2 {
+  color: black;
+  margin: 1px;
+}
+.max1 {
+  width: 6;
+}
+.max2 {
+  width: 8;
+}
+.glob1 {
+  margin: auto auto;
+}
+.ops1 {
+  height: gt-or-eq;
+  height: lt-or-eq;
+}
+.ops2 {
+  height: gt-or-eq;
+  height: not-eq;
+}
+.ops3 {
+  height: lt-or-eq;
+  height: not-eq;
+}
+.default1 {
+  content: default;
+}
+.test1 {
+  content: "true.";
+}
+.test2 {
+  content: "false.";
+}
+.test3 {
+  content: "false.";
+}
+.test4 {
+  content: "false.";
+}
+.test5 {
+  content: "false.";
+}
+.bool1 {
+  content: true and true;
+  content: true;
+  content: false, true;
+  content: false and true and true, true;
+  content: false, true and true;
+  content: false, false, true;
+  content: false, true and true and true, false;
+  content: not false;
+  content: not false and false, not false;
+}

data/lib/less/js/test/css/mixins-important.css

@@ -0,0 +1,17 @@
+.class {
+  border: 1;
+  boxer: 1;
+  border: 2 !important;
+  boxer: 2 !important;
+  border: 3;
+  boxer: 3;
+  border: 4 !important;
+  boxer: 4 !important;
+  border: 5;
+  boxer: 5;
+  border: 0 !important;
+  boxer: 0 !important;
+  border: 9 !important;
+  border: 9;
+  boxer: 9;
+}

data/lib/less/js/test/css/mixins.css

@@ -48,7 +48,8 @@
 .direct {
   border-style: dotted;
 }
-.bo, .bar {
+.bo,
+.bar {
   width: 100%;
 }
 .bo {

data/lib/less/js/test/css/operations.css

@@ -26,6 +26,9 @@
 .shorthands {
   padding: -1px 2px 0 -4px;
 }
+.rem-dimensions {
+  font-size: 5.5rem;
+}
 .colors {
   color: #123;
   border-color: #334455;

data/lib/less/js/test/css/parens.css

@@ -1,5 +1,5 @@
 .parens {
-  border: 2px solid black;
+  border: 2px solid #000000;
   margin: 1px 3px 16 3;
   width: 36;
   padding: 2px 36px;

data/lib/less/js/test/css/rulesets.css

@@ -13,7 +13,9 @@
 #first > .one > #second .two > #deux #third:focus #fifth > #sixth .seventh #eighth + #ninth {
   color: purple;
 }
-#first > .one > #second .two > #deux #fourth, #first > .one > #second .two > #deux #five, #first > .one > #second .two > #deux #six {
+#first > .one > #second .two > #deux #fourth,
+#first > .one > #second .two > #deux #five,
+#first > .one > #second .two > #deux #six {
   color: #110000;
 }
 #first > .one > #second .two > #deux #fourth .seven,
@@ -24,6 +26,8 @@
 #first > .one > #second .two > #deux #six .eight > #nine {
   border: 1px solid black;
 }
-#first > .one > #second .two > #deux #fourth #ten, #first > .one > #second .two > #deux #five #ten, #first > .one > #second .two > #deux #six #ten {
+#first > .one > #second .two > #deux #fourth #ten,
+#first > .one > #second .two > #deux #five #ten,
+#first > .one > #second .two > #deux #six #ten {
   color: red;
 }

data/lib/less/js/test/css/scope.css

@@ -2,14 +2,14 @@
   color: #998899;
 }
 .scope1 {
-  color: blue;
-  border-color: black;
+  color: #0000ff;
+  border-color: #000000;
 }
 .scope1 .scope2 {
-  color: blue;
+  color: #0000ff;
 }
 .scope1 .scope2 .scope3 {
-  color: red;
-  border-color: black;
-  background-color: white;
+  color: #ff0000;
+  border-color: #000000;
+  background-color: #ffffff;
 }

data/lib/less/js/test/css/selectors.css

@@ -27,7 +27,8 @@ td {
   margin: 0;
   padding: 0;
 }
-td, input {
+td,
+input {
   line-height: 1em;
 }
 a {
@@ -42,12 +43,15 @@ div a {
 p a span {
   color: yellow;
 }
-.foo .bar .qux, .foo .baz .qux {
+.foo .bar .qux,
+.foo .baz .qux {
   display: block;
 }
-.qux .foo .bar, .qux .foo .baz {
+.qux .foo .bar,
+.qux .foo .baz {
   display: inline;
 }
-.qux .foo .bar .biz, .qux .foo .baz .biz {
+.qux .foo .bar .biz,
+.qux .foo .baz .biz {
   display: none;
 }