[Pkg-javascript-commits] [less.js] 08/285: Merge branch 'color-string-variable' of https://github.com/seven-phases-max/less.js into 2_0_0

[Jonas Smedegaard]

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

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

commit 8ddcf66a67329e94f6b1517607a1a1d8983e5d85
Merge: 21165a3 e1877d8
Author: Luke Page <luke.a.page at gmail.com>
Date:   Thu Feb 13 22:43:53 2014 +0000

    Merge branch 'color-string-variable' of https://github.com/seven-phases-max/less.js into 2_0_0

 lib/less/functions.js                   | 28 ++++++++---------
 lib/less/parser.js                      | 10 ++----
 lib/less/tree/color.js                  | 55 +++++++++++++++++----------------
 test/browser/css/global-vars/simple.css |  2 +-
 test/browser/css/modify-vars/simple.css |  4 +--
 test/css/comments.css                   |  4 +--
 test/css/css-3.css                      |  2 +-
 test/css/css-escapes.css                |  2 +-
 test/css/css.css                        |  2 +-
 test/css/extract-and-length.css         |  2 +-
 test/css/functions.css                  |  5 ++-
 test/css/globalVars/simple.css          |  2 +-
 test/css/import-once.css                |  2 +-
 test/css/import.css                     |  6 ++--
 test/css/mixins-args.css                |  4 +--
 test/css/mixins-guards-default-func.css |  4 +--
 test/css/mixins-guards.css              |  6 ++--
 test/css/parens.css                     |  2 +-
 test/css/scope.css                      | 14 ++++-----
 test/css/selectors.css                  |  8 ++---
 test/css/strings.css                    |  8 ++---
 test/css/whitespace.css                 |  4 +--
 test/less/functions.less                |  5 ++-
 test/sourcemaps/basic.json              |  2 +-
 24 files changed, 92 insertions(+), 91 deletions(-)

diff --cc test/css/functions.css
index d2444b5,5401cc5..6a426b6
--- a/test/css/functions.css
+++ b/test/css/functions.css
@@@ -84,13 -82,15 +84,16 @@@
    pow: 64;
    pow: 27;
    min: 0;
 -  min: min("junk", 5);
 -  min: 3pt;
 +  min: 5;
 +  min: 1pt;
 +  min: 3mm;
    max: 3;
 -  max: max(8%, 1cm);
 +  max: 5em;
    percentage: 20%;
-   color: #ff0011;
+   color-quoted-digit: #dda0dd;
+   color-quoted-keyword: #dda0dd;
+   color-color: #dda0dd;
+   color-keyword: #dda0dd;
    tint: #898989;
    tint-full: #ffffff;
    tint-percent: #898989;
diff --cc test/less/functions.less
index 863031a,9772c93..29193cb
--- a/test/less/functions.less
+++ b/test/less/functions.less
@@@ -91,13 -88,15 +91,16 @@@
    pow: pow(4, 3);
    pow: pow(3, 3em);
    min: min(0);
 -  min: min("junk", 6, 5);
 -  min: min(1pc, 3pt);
 +  min: min(6, 5);
 +  min: min(1pt, 3pt);
 +  min: min(1cm, 3mm);
    max: max(1, 3);
 -  max: max(3%, 1cm, 8%, 2mm);
 +  max: max(3em, 1em, 2em, 5em);
    percentage: percentage((10px / 50));
-   color: color("#ff0011");
+   color-quoted-digit: color("#dda0dd");
+   color-quoted-keyword: color("plum");
+   color-color: color(#dda0dd);
+   color-keyword: color(plum);
    tint: tint(#777777, 13);
    tint-full: tint(#777777, 100);
    tint-percent: tint(#777777, 13%);

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