less 1.7.4 → 1.7.5

package/test/css/comments.css

@@ -55,6 +55,14 @@
 .test {
   color: 1px;
 }
+.sr-only-focusable {
+  clip: auto;
+}
+@-webkit-keyframes hover {
+  0% {
+    color: red;
+  }
+}
 #last {
   color: #0000ff;
 }

package/test/css/css-3.css

@@ -127,6 +127,12 @@ h1 {
 body ^^ .shadow {
   display: done;
 }
+:host(.sel .a),
+:host-context(.sel .b),
+.sel /deep/ .b,
+::content .sel {
+  type: shadow-dom;
+}
 #issue2066 {
   background: url('/images/icon-team.svg') 0 0 / contain;
 }

package/test/css/import.css

@@ -35,3 +35,8 @@
     color: yellow;
   }
 }
+@media print {
+  body {
+    width: 100%;
+  }
+}

package/test/css/mixins.css

@@ -7,6 +7,9 @@
 .borders {
   border-style: dashed;
 }
+.mixin > * {
+  border: do not match me;
+}
 #namespace .borders {
   border-style: dotted;
 }

package/test/css/property-name-interp.css

@@ -1,5 +1,6 @@
 pi-test {
   border: 0;
+  @not-variable: @not-variable;
   ufo-width: 50%;
   *-z-border: 1px dashed blue;
   -www-border-top: 2px;

package/test/css/urls.css

@@ -53,6 +53,7 @@
 }
 #data-uri {
   uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
+  uri-fragment: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==#fragment");
 }
 #data-uri-guess {
   uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");

package/test/less/comments.less

@@ -62,7 +62,7 @@
 */
 
 .selector /* .with */, .lots, /* of */ .comments {
-  color: grey, /* blue */ orange;
+  color/* survive */ /* me too */: grey, /* blue */ orange;
   -webkit-border-radius: 2px /* webkit only */;
   -moz-border-radius: (2px * 4) /* moz only with operation */;
 }
@@ -77,6 +77,19 @@
 }
 .mixin_def_with_colors();
 
+// .s when
+//R/2
+
+.sr-only-focusable {
+  clip: auto;
+}
+
+@-webkit-keyframes /* Safari */ hover /* and Chrome */ {
+  0% {
+    color: red;
+  }
+}
+
 #last { color: blue }
 //
 

package/test/less/css-3.less

@@ -128,6 +128,13 @@ body ^^ .shadow {
   display: done;
 }
 
+:host(.sel .a),
+:host-context(.sel .b),
+.sel /deep/ .b,
+::content .sel {
+  type: shadow-dom;
+}
+
 #issue2066 {
   background: url('/images/icon-team.svg') 0 0 / contain;
 }

package/test/less/errors/import-malformed.less

@@ -1 +1 @@
-@import malformed "this-statement-is-invalid.less";
+@import malformed "this-statement-is-invalid.less";

package/test/less/errors/import-malformed.txt

@@ -1,3 +1,3 @@
-SyntaxError: malformed import statement in {path}import-malformed.less on line 1, column 1:
-1 @import malformed "this-statement-is-invalid.less";
-2 
+SyntaxError: malformed import statement in {path}import-malformed.less on line 1, column 1:
+1 @import malformed "this-statement-is-invalid.less";
+2 

package/test/less/import.less

@@ -1,4 +1,3 @@
-@charset "UTF-8"; // stay on top #2013
 @import url(http://fonts.googleapis.com/css?family=Open+Sans);
 
 @import url(/absolute/something.css) screen and (color) and (max-width: 600px);
@@ -19,4 +18,11 @@
 
 @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);
+@import (less, multiple) url("import/import-test-d.css") screen and (max-width: 603px);
+
+@media print {
+  @import (multiple) "import/import-test-e";
+}
+
+@charset "UTF-8"; // climb on top #2126
+

package/test/less/mixins.less

@@ -1,6 +1,7 @@
 .mixin { border: 1px solid black; }
 .mixout { border-color: orange; }
 .borders { border-style: dashed; }
+.mixin > * { border: do not match me; }
 
 #namespace {
   .borders {

package/test/less/property-name-interp.less

@@ -6,8 +6,11 @@ pi-test {
     @c_c:    left;
     @d-d4: radius;
     @-:         -;
-    
+
+    @var: ~'@not-variable';
+
     @{a}: 0;
+    @{var}: @var;
     @{prefix}width: 50%;
     *-z-@{a} :1px dashed blue;
     -www-@{a}-@{bb}: 2px;

package/test/less/property-name-interp.less.orig

@@ -0,0 +1,59 @@
+
+pi-test {
+    @prefix: ufo-;
+    @a:    border;
+    @bb:      top;
+    @c_c:    left;
+    @d-d4: radius;
+    @-:         -;
+
+<<<<<<< HEAD
+=======
+    @var: ~'@not-variable';
+
+>>>>>>> origin/master
+    @{a}: 0;
+    @{var}: @var;
+    @{prefix}width: 50%;
+    *-z-@{a} :1px dashed blue;
+    -www-@{a}-@{bb}: 2px;
+    @{d-d4}-is-not-a-@{a}:true;
+    @{a}-@{bb}-@{c_c}-@{d-d4}       : 2em;
+    @{a}@{-}@{bb}@{-}red@{-}@{d-d4}-: 3pt;
+
+    .mixin(mixer);
+    .merge(ish, base);
+}
+
+@global: global;
+
+.mixin(@arg) {
+    @local: local;
+    @{global}-@{local}-@{arg}-property: strong;
+}
+
+.merge(@p, @v) {
+    &-merge {
+        @prefix: pre;
+        @suffix: ish;
+        @{prefix}-property-ish+       :high;
+        pre-property-@{suffix}    +: middle;
+        @{prefix}-property-@{suffix}+:  low;
+        @{prefix}-property-@{p}   +  :   @v;
+
+        @subterfuge: ~'+';
+        pre-property-ish@{subterfuge}: nice try dude;
+    }
+}
+
+pi-indirect-vars {
+    @{p}: @p;
+    @p: @@a;
+    @a: b;
+    @b: auto;
+}
+
+pi-complex-values {
+    @{p}@{p}: none;
+    @p: (1 + 2px) fadeout(#ff0, 50%), pi() /* foo */;
+}

package/test/less/urls.less

@@ -42,6 +42,7 @@
 
 #data-uri {
   uri: data-uri('image/jpeg;base64', '../data/image.jpg');
+  uri-fragment: data-uri('image/jpeg;base64', '../data/image.jpg#fragment');
 }
 
 #data-uri-guess {
@@ -80,4 +81,4 @@
   src+: format('truetype');
   src+_: url('webfont.ttf');
   src+: url('webfont.svg#svgFontName') format('svg');
-}
+}

package/test/modify-vars.js

@@ -0,0 +1,17 @@
+var less = require('../lib/less'),
+  fs = require('fs')
+
+var input = fs.readFileSync("./test/less/modifyVars/extended.less", 'utf8')
+var expectedCss = fs.readFileSync('./test/css/modifyVars/extended.css', 'utf8')
+var options = {
+  modifyVars: JSON.parse(fs.readFileSync("./test/less/modifyVars/extended.json", 'utf8'))
+}
+
+less.render(input, options, function (err, css) {
+  if (err) console.log(err);
+  if (css === expectedCss) {
+    console.log("PASS")
+  } else {
+    console.log("FAIL")
+  }
+})

package/tmp/browser/test-runner-main.html

@@ -21,6 +21,10 @@
       <link id="original-less:test-less-comments" title="test-less-comments" rel="stylesheet/less" type="text/css" href="../../test/less/comments.less">
       <link id="expected-less:test-less-comments" rel="stylesheet" type="text/css" href="../../test/css/comments.css">
     
+      <!-- the tags to be generated -->
+      <link id="original-less:test-less-comments2" title="test-less-comments2" rel="stylesheet/less" type="text/css" href="../../test/less/comments2.less">
+      <link id="expected-less:test-less-comments2" rel="stylesheet" type="text/css" href="../../test/css/comments2.css">
+    
       <!-- the tags to be generated -->
       <link id="original-less:test-less-css-3" title="test-less-css-3" rel="stylesheet/less" type="text/css" href="../../test/less/css-3.less">
       <link id="expected-less:test-less-css-3" rel="stylesheet" type="text/css" href="../../test/css/css-3.css">