less 2.2.2 → 2.6.0

data/lib/less/js/test/less/import-reference.less

@@ -0,0 +1,21 @@
+@import (reference) url("import-once.less");
+@import (reference) url("css-3.less");
+@import (reference) url("media.less");
+@import (reference) url("import/import-reference.less");
+
+.b {
+  .z();
+}
+
+.zz();
+
+.visible:extend(.z all) {
+  extend: test;
+}
+
+.test-mediaq-import {
+  .mixin-with-mediaq(340px);
+}
+
+.class:extend(.class all) {
+}

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

@@ -1,11 +1,21 @@
-@import url("import/import-test-a.less");
 @import url(http://fonts.googleapis.com/css?family=Open+Sans);
 
-@import url(something.css) screen and (color) and (max-width: 600px);
+@import url(/absolute/something.css) screen and (color) and (max-width: 600px);
+
+@var: 100px;
+@import url("//ha.com/file.css") (min-width:@var);
 
 #import-test {
   .mixin;
   width: 10px;
-  height: @a + 10%;
+  height: (@a + 10%);
 }
 @import "import/import-test-e" screen and (max-width: 600px);
+
+@import url("import/import-test-a.less");
+
+@import (less, multiple) "import/import-test-d.css" screen and (max-width: 601px);
+
+@import (multiple) "import/import-test-e" screen and (max-width: 602px);
+
+@import (less, multiple) url("import/import-test-d.css") screen and (max-width: 603px);

data/lib/less/js/test/less/javascript.less

@@ -3,12 +3,14 @@
     js: `1 + 1`;
     js: `"hello world"`;
     js: `[1, 2, 3]`;
-    title: `process.title`;
+    title: `typeof process.title`;
     ternary: `(1 + 1 == 2 ? true : false)`;
+    multiline: `(function(){var x = 1 + 1;
+           return x})()`;
 }
 .scope {
     @foo: 42;
-    var: `this.foo.toJS()`;
+    var: `parseInt(this.foo.toJS())`;
     escaped: ~`2 + 5 + 'px'`;
 }
 .vars {
@@ -23,5 +25,5 @@
     @ary:  1, 2, 3;
     @ary2: 1  2  3;
     ary: `@{ary}.join(', ')`;
-    ary: `@{ary2}.join(', ')`;
+    ary1: `@{ary2}.join(', ')`;
 }

data/lib/less/js/test/less/legacy/legacy.less

@@ -0,0 +1,7 @@
+@media (-o-min-device-pixel-ratio: 2/1) {
+  .test-math-and-units {
+    font: ignores 0/0 rules;
+    test-division: 4 / 2 + 5em;
+    simple: 1px + 1px;
+  }
+}

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

@@ -11,13 +11,20 @@
         }
     }
     .top, header > h1 {
-        color: #222 * 2;
+        color: (#222 * 2);
     }
 }
 
 @media screen {
     @base: 8;
-    body { max-width: @base * 60; }
+    body { max-width: (@base * 60); }
+}
+
+@ratio_large: 16;
+@ratio_small: 9;
+
+@media all and (device-aspect-ratio: @ratio_large / @ratio_small) {
+   body { max-width: 800px; }
 }
 
 @media all and (orientation:portrait) {
@@ -44,6 +51,33 @@ body {
     }
 }
 
+@media screen {
+  .sidebar {
+    width: 300px;
+    @media (orientation: landscape) {
+      width: 500px;
+    }
+  }
+}
+
+@media a {
+  .first {
+    @media b {
+      .second {
+        .third {
+          width: 300px;
+          @media c {
+            width: 500px;
+          }
+        }
+        .fourth {
+          width: 3;
+        }
+      }
+    }
+  }
+}
+
 body {
     @media a, b and c {
         width: 95%;
@@ -75,5 +109,126 @@ body {
 }
 @smartphone: ~"only screen and (max-width: 200px)";
 @media @smartphone {
-  width: 480px;
+  body {
+    width: 480px;
+  }
+}
+
+@media print {
+  @page :left {
+    margin: 0.5cm;
+  }
+  @page :right {
+    margin: 0.5cm;
+  }
+  @page Test:first {
+    margin: 1cm;
+  }
+  @page :first {
+    size: 8.5in 11in;
+	@top-left {
+      margin: 1cm;
+    }
+    @top-left-corner {
+      margin: 1cm;
+    }
+    @top-center {
+      margin: 1cm;
+    }
+    @top-right {
+      margin: 1cm;
+    }
+    @top-right-corner {
+      margin: 1cm;
+    }
+    @bottom-left {
+      margin: 1cm;
+    }
+    @bottom-left-corner {
+      margin: 1cm;
+    }
+    @bottom-center {
+      margin: 1cm;
+    }
+    @bottom-right {
+      margin: 1cm;
+    }
+    @bottom-right-corner {
+      margin: 1cm;
+    }
+    @left-top {
+      margin: 1cm;
+    }
+    @left-middle {
+      margin: 1cm;
+    }
+    @left-bottom {
+      margin: 1cm;
+    }
+    @right-top {
+      margin: 1cm;
+    }
+    @right-middle {
+      content: "Page " counter(page);
+    }
+    @right-bottom {
+      margin: 1cm;
+    }
+  }
+}
+
+@media (-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: 2/1), (min-resolution: 2dppx), (min-resolution: 128dpcm) {
+  .b {
+    background: red;
+  }
+}
+
+.bg() {
+    background: red;
+
+    @media (max-width: 500px) {
+        background: green;
+    }
+}
+
+body {
+    .bg();
+}
+
+@bpMedium: 1000px;
+@media (max-width: @bpMedium) {
+    body {        
+        .bg();
+        background: blue;
+    }
+}
+
+@media (max-width: 1200px) {
+  /* a comment */
+
+  @media (max-width: 900px) {
+    body { font-size: 11px; }
+  }
+}
+
+.nav-justified {
+  @media (min-width: 480px) {
+    > li {
+      display: table-cell;
+    }
+  }
+}
+
+.menu
+{
+  @media (min-width: 768px) {
+    .nav-justified();
+  }
 }
+@all: ~"all";
+@tv: ~"tv";
+@media @all and @tv {
+  .all-and-tv-variables {
+    var: all-and-tv;
+  }
+}

data/lib/less/js/test/less/merge.less

@@ -0,0 +1,78 @@
+.first-transform() {
+  transform+: rotate(90deg), skew(30deg);
+}
+.second-transform() {
+  transform+: scale(2,4);
+}
+.third-transform() {
+  transform: scaleX(45deg);
+}
+.fourth-transform() {
+  transform+: scaleX(45deg);
+}
+.fifth-transform() {
+  transform+: scale(2,4) !important;
+}
+.first-background() {
+  background+: url(data://img1.png);
+}
+.second-background() {
+  background+: url(data://img2.png);
+}
+
+.test1 {
+  // Can merge values
+  .first-transform();
+  .second-transform();
+}
+.test2 {
+  // Wont merge values without +: merge directive, for backwards compatibility with css
+  .first-transform();
+  .third-transform();
+}
+.test3 {
+  // Wont merge values from two sources with different properties
+  .fourth-transform();
+  .first-background();
+}
+.test4 {
+  // Wont merge values from sources that merked as !important, for backwards compatibility with css
+  .first-transform();
+  .fifth-transform();
+}
+.test5 {
+  // Wont merge values from mixins that merked as !important, for backwards compatibility with css 
+  .first-transform();
+  .second-transform() !important;
+}
+.test6 {
+  // Ignores !merge if no peers found
+  .second-transform();
+}
+
+.test-interleaved {
+    transform+:  t1;
+    background+: b1;
+    transform+:  t2;
+    background+: b2, b3;
+    transform+:  t3;
+}
+
+.test-spaced {
+    transform+_:  t1;
+    background+_: b1;
+    transform+_:  t2;
+    background+_: b2, b3;
+    transform+_:  t3;
+}
+
+.test-interleaved-with-spaced {
+    transform+_:  t1s;
+    transform+:   t2;
+    background+:  b1;
+    transform+_:  t3s;
+    transform+:   t4 t5s;
+    background+_: b2s, b3;
+    transform+_:  t6s;
+    background+:  b4;
+}

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

@@ -1,6 +1,6 @@
 .mixin (@a: 1px, @b: 50%) {
-  width: @a * 5;
-  height: @b - 1%;
+  width: (@a * 5);
+  height: (@b - 1%);
 }
 
 .mixina (@style, @width, @color: black) {
@@ -19,6 +19,9 @@
 
 #hidden {
   .hidden;
+}
+
+#hidden1 {
   .hidden();
 }
 
@@ -42,7 +45,7 @@
 
 .var-args {
   @var: 9;
-  .mixin(@var, @var * 2);
+  .mixin(@var, (@var * 2));
 }
 
 .multi-mix {
@@ -51,7 +54,7 @@
 }
 
 .maxa(@arg1: 10, @arg2: #f00) {
-  padding: @arg1 * 2px;
+  padding: (@arg1 * 2px);
   color: @arg2;
 }
 
@@ -61,7 +64,7 @@ body {
 
 @glob: 5;
 .global-mixin(@a:2) {
-  width: @glob + @a;
+  width: (@glob + @a);
 }
 
 .scope-mix {
@@ -96,16 +99,6 @@ body {
 }
 #var-inside { .var-inside; }
 
-// # mixins
-
-#id-mixin () {
-    color: red;
-}
-.id-class {
-    #id-mixin();
-    #id-mixin;
-}
-
 .mixin-arguments (@width: 0px, ...) {
     border: @arguments;
     width: @width;
@@ -135,3 +128,88 @@ body {
 .edge-case {
     .mixin-arguments("{");
 }
+
+// Division vs. Literal Slash
+.border-radius(@r: 2px/5px) {
+  border-radius: @r;
+}
+.slash-vs-math {
+  .border-radius();
+  .border-radius(5px/10px);
+  .border-radius((3px * 2));
+}
+// semi-colon vs comma for delimiting
+
+.mixin-takes-one(@a) {
+    one: @a;
+}
+
+.mixin-takes-two(@a; @b) {
+    one: @a;
+    two: @b;
+}
+
+.comma-vs-semi-colon {
+    .mixin-takes-two(@a : a; @b : b, c);
+    .mixin-takes-two(@a : d, e; @b : f);
+    .mixin-takes-one(@a: g);
+    .mixin-takes-one(@a : h;);
+    .mixin-takes-one(i);
+    .mixin-takes-one(j;);
+    .mixin-takes-two(k, l);
+    .mixin-takes-one(m, n;);
+    .mixin-takes-two(o, p; q);
+    .mixin-takes-two(r, s; t;);
+}
+
+.mixin-conflict(@a:defA, @b:defB, @c:defC) {
+  three: @a, @b, @c;
+}
+
+.mixin-conflict(@a:defA, @b:defB, @c:defC, @d:defD) {
+  four: @a, @b, @c, @d;
+}
+
+#named-conflict {
+  .mixin-conflict(11, 12, 13, @a:a);
+  .mixin-conflict(@a:a, 21, 22, 23);
+}
+@a: 3px;
+.mixin-default-arg(@a: 1px, @b: @a, @c: @b) {
+  defaults: 1px 1px 1px;
+  defaults: 2px 2px 2px;
+}
+
+.test-mixin-default-arg {
+  .mixin-default-arg();
+  .mixin-default-arg(2px);
+}
+
+.mixin-comma-default1(@color; @padding; @margin: 2, 2, 2, 2) {
+  margin: @margin;
+}
+.selector {
+  .mixin-comma-default1(#33acfe; 4);
+}
+.mixin-comma-default2(@margin: 2, 2, 2, 2;) {
+  margin: @margin;
+}
+.selector2 {
+  .mixin-comma-default2();
+}
+.mixin-comma-default3(@margin: 2, 2, 2, 2) {
+  margin: @margin;
+}
+.selector3 {
+  .mixin-comma-default3(4,2,2,2);
+}
+
+.test-calling-one-arg-mixin(@a) {
+}
+
+.test-calling-one-arg-mixin(@a, @b, @rest...) {
+}
+
+div {
+  .test-calling-one-arg-mixin(1);
+}

data/lib/less/js/test/less/mixins-guards-default-func.less

@@ -0,0 +1,195 @@
+
+// basics:
+
+guard-default-basic-1 {
+    .m(1)                   {case:     1}
+    .m(@x) when (default()) {default: @x}
+
+    &-1 {.m(1)}
+    &-2 {.m(2)}
+}
+
+guard-default-basic-2 {
+    .m(1)                   {case:     1}
+    .m(2)                   {case:     2}
+    .m(3)                   {case:     3}
+    .m(@x) when (default()) {default: @x}
+
+    &-0 {.m(0)}
+    &-2 {.m(2)}
+}
+
+guard-default-basic-3 {
+    .m(@x) when (@x = 1)    {case:     1}
+    .m(2)                   {case:     2}
+    .m(@x) when (@x = 3)    {case:     3}
+    .m(@x) when (default()) {default: @x}
+
+    &-0 {.m(0)}
+    &-2 {.m(2)}
+    &-3 {.m(3)}
+}
+
+guard-default-definition-order {
+    .m(@x) when (default()) {default: @x}
+    .m(@x) when (@x = 1)    {case:     1}
+    .m(2)                   {case:     2}
+    .m(@x) when (@x = 3)    {case:     3}
+
+    &-0 {.m(0)}
+    &-2 {.m(2)}
+    &-2 {.m(3)}
+}
+
+// out of guard:
+
+guard-default-out-of-guard {
+    .m(1)                              {case-1:   1}
+    .m(@x: default()) when (default()) {default: @x}
+    
+    &-0 {
+        case-0: default();
+        .m(1);
+        .m(2);
+        case-2: default();
+    }
+    &-1 {.m(default())}
+    &-2 {.m()}
+}
+
+// expressions:
+
+guard-default-expr-not {
+    .m(1)                      {case:     1}
+    .m(@x) when not(default()) {default: @x}
+
+    &-1 {.m(1)}
+    &-2 {.m(2)}
+}
+
+guard-default-expr-eq {
+    .m(@x) when (@x = true)      {case:    @x}
+    .m(@x) when (@x = false)     {case:    @x}
+    .m(@x) when (@x = default()) {default: @x}
+
+    &-true  {.m(true)}
+    &-false {.m(false)}
+}
+
+guard-default-expr-or {
+    .m(1)                             {case:     1}
+    .m(2)                             {case:     2}
+    .m(@x) when (default()), (@x = 2) {default: @x}
+
+    &-1 {.m(1)}
+    &-2 {.m(2)}
+    &-3 {.m(3)}
+}
+
+guard-default-expr-and {
+    .m(1)                                {case:     1}
+    .m(2)                                {case:     2}
+    .m(@x) when (default()) and (@x = 3) {default: @x}
+
+    &-1 {.m(1)}
+    &-2 {.m(2)}
+    &-3 {.m(3)}
+    &-4 {.m(4)}
+}
+
+guard-default-expr-always {
+    .m(1)                                   {case:     1}
+    .m(@x) when (default()), not(default()) {default: @x} // always match
+
+    &-1 {.m(1)}
+    &-2 {.m(2)}
+}
+
+guard-default-expr-never {
+    .m(1)                                      {case:     1}
+    .m(@x) when (default()) and not(default()) {default: @x} // never match
+
+    &-1 {.m(1)}
+    &-2 {.m(2)}
+}
+
+
+// not conflicting multiple default() uses:
+
+guard-default-multi-1 {
+    .m(0)                   {case:       0}
+    .m(@x) when (default()) {default-1: @x}
+    .m(2)  when (default()) {default-2: @x}
+
+    &-0 {.m(0)}
+    &-1 {.m(1)}
+}
+
+guard-default-multi-2 {
+    .m(1, @x)   when (default()) {default-1: @x}
+    .m(2, @x)   when (default()) {default-2: @x}
+    .m(@x, yes) when (default()) {default-3: @x}
+
+    &-1 {.m(1, no)}
+    &-2 {.m(2, no)}
+    &-3 {.m(3, yes)}
+}
+
+guard-default-multi-3 {
+    .m(red)                                    {case-1: darkred}
+    .m(blue)                                   {case-2: darkblue}
+    .m(@x) when (iscolor(@x)) and (default())  {default-color: @x}
+    .m('foo')                                  {case-1: I am 'foo'}
+    .m('bar')                                  {case-2: I am 'bar'}
+    .m(@x) when (isstring(@x)) and (default()) {default-string: I am @x}
+
+    &-blue  {.m(blue)}
+    &-green {.m(green)}
+    &-foo   {.m('foo')}
+    &-baz   {.m('baz')}
+}
+
+guard-default-multi-4 {
+    .m(@x) when (default()), not(default())    {always: @x}
+    .m(@x) when (default()) and not(default()) {never:  @x}
+    .m(2)                                      {case:    2}
+    
+    .m(1);
+    .m(2);
+}
+
+guard-default-not-ambiguos-2 {
+    .m(@x)                     {case:         1}
+    .m(@x) when (default())    {default:     @x}
+    .m(@x) when not(default()) {not-default: @x}
+
+    .m(2);
+}
+
+guard-default-not-ambiguos-3 {
+    .m(@x)                     {case:           1}
+    .m(@x) when not(default()) {not-default-1: @x}
+    .m(@x) when not(default()) {not-default-2: @x}
+
+    .m(2);
+}
+
+// default & scope
+
+guard-default-scopes {
+    .s1() {.m(@v)                  {1: no condition}}
+    .s2() {.m(@v) when (@v)        {2: when true}}
+    .s3() {.m(@v) when (default()) {3: when default}}
+
+    &-3 {
+        .s2();
+        .s3();
+        .m(false);
+    }
+    
+    &-1 {
+        .s1();
+        .s3();
+        .m(false);
+    }
+}