[Pkg-javascript-commits] [less.js] 51/58: Merge remote-tracking branch 'sommeri/import-refence-directives-2008'

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag v2.3.0
in repository less.js.

commit ab96e71a348fa49054c59fa78f5cce904ed4e3c4
Merge: 10586f0 ed9b6ef
Author: Luke Page <luke.a.page at gmail.com>
Date:   Mon Jan 26 22:08:35 2015 +0000

    Merge remote-tracking branch 'sommeri/import-refence-directives-2008'
    
    Conflicts:
    	test/css/import-reference.css
    	test/less/import-reference.less
    	test/less/import/import-reference.less

 lib/less/tree/directive.js             |  5 +++--
 test/css/import-reference.css          | 11 +++++++++++
 test/less/import-reference.less        |  3 ++-
 test/less/import/import-reference.less | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --cc test/css/import-reference.css
index 0d06c2b,27a14db..7aa622c
--- a/test/css/import-reference.css
+++ b/test/css/import-reference.css
@@@ -74,9 -66,14 +74,20 @@@ div#id.class[a=1][b=2].class:not(1) 
      color: red;
    }
  }
 +.test {
 +  color: red;
 +}
 +.test:first-child {
 +  color: blue;
 +}
+ @keyframes some-name {
+   property: value;
+ }
+ @supports (animation-name: test) {
+   @keyframes some-name {
+     property: value;
+   }
+   .selector {
+     color: red;
+   }
+ }
diff --cc test/less/import-reference.less
index 77df43b,97a628c..7a457bf
--- a/test/less/import-reference.less
+++ b/test/less/import-reference.less
@@@ -19,4 -19,5 +19,5 @@@
  
  .class:extend(.class all) {
  }
- .mixin-with-nested-selectors();
 -
++.mixin-with-nested-selectors();
+ .mixin-with-directives(some-name);
diff --cc test/less/import/import-reference.less
index f4c9c74,33be5dc..cadf09f
--- a/test/less/import/import-reference.less
+++ b/test/less/import/import-reference.less
@@@ -49,26 -49,18 +49,41 @@@
      color: red;
    }
  }
 +//https://github.com/less/less.js/issues/2359
 + at supports (something: else) {
 +  .class {
 +    something: else;
 +  }
 +  .nestedToo {
 +    .class {
 +      something: else;
 +    }
 +  }
 +  .invisible {
 +    something: else;
 +  }
 +}
 +//https://github.com/less/less.js/issues/1979
 +.mixin-with-nested-selectors() {
 +  .test {
 +    color: red;
 +    &:first-child {
 +      color: blue;
 +    }
 +  }
++}
+ .mixin-with-directives(@keyframeName) {
+   @keyframes @keyframeName {
+     @rules1();
+   }
+   @supports (animation-name: test) {
+     @keyframes @keyframeName {
+       @rules2();
+     }
+     .selector {
+       color: red;
+     }
+   }
+   @rules1: {property: value;};
+   @rules2: {property: value;};
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/less.js.git