409 Commits

Author SHA1 Message Date
jurcovicovam
c6cf6a8a6a Moved @font-face property merge test into urls.less and re-enabled
merge.less in jasmine tests.
2014-07-27 14:12:57 +02:00
jurcovicovam
8daa61f220 Merge https://github.com/less/less.js into font-face-property-merge-2-2035
Conflicts:
	test/sourcemaps/basic.json
2014-07-27 14:02:38 +02:00
jurcovicovam
c9c6ddbdfc Properties merging should work also inside directives #2035
Fixes issue #2035 - property merge inside @font-face. The _mergeRules function is now called also for directives with rules. It used to be called only for rulesets.

I had to turn off jasmine tests for merge.less, because it was replacing all urls by their assumed full paths. For example, the url(something.eot) was changed into url(http://localhost:8081/test/less/something.eot). The result did not matched with expected css and failed.

Note: I'm not sure why values order in source map changed. It does not seem to be caused by my change, it was failing before I made them.
2014-07-26 00:22:49 +02:00
jurcovicovam
864c63d27b Fix ordering of @import and @charset rules #1954 #2013
The genCss method of ruleset.js splits child nodes into two groups:
* rules,
* rulesets.

Rules are always printed first and have special handling for last rule.
Rulesets are always printed second. Wrong ordering was caused by the
condition that determined what is rule and what is ruleset.

Issue #2013: The condition made no difference between @charset and @page,
because both are compiled into tree.Directive nodes. I added isRulesetLike
method to the tree.Directive to differentiate between them.

Issue #1954: The condition treated all tree.Anonymous types as rules and
caused them to float up. That is incorrect, because `@import (inline)` is
compiled into tree.Anonymous too, but should be treated as ruleset and
stay where it is.
2014-07-22 14:46:58 +02:00
Luke Page
5e13673674 Merge branch 'master' of https://github.com/less/less.js 2014-06-22 11:24:02 +01:00
Luke Page
fc26d5c77e Fix backtracking on multiplication to support dimension /|* keyword, with or without strict maths. Fixes #2066. 2014-06-22 11:23:33 +01:00
seven-phases-max
91fdb3940f don't round values returned by colour query functions. 2014-06-19 22:43:28 +04:00
Luke Page
04cb8bdfb2 fix regression with jsifying code - all dimensions would be rounded. Fixes #2057 2014-06-18 06:18:02 +01:00
seven-phases-max
563c47b7d7 Fixes a regression when a mixin guard can't see the mixin parameter variables in certain cases. 2014-05-10 07:43:03 +04:00
Luke Page
5647d4d276 Ignore quote type when comparing values. Fixes #1992 2014-05-06 06:20:07 +01:00
Luke Page
17a92e3f9b Merge pull request #1890 from roelvanduijnhoven/feature/luma-definition
Let `luma` follow spec
2014-02-27 19:53:41 +00:00
Roel van Duijnhoven
e7389a0e7a Introduce luminance function.
The behaviour of this function is identical to luma prior to LESS 1.7.
2014-02-27 08:45:24 +01:00
Roel van Duijnhoven
193ce01be9 Sync semantics of test variables and their output. 2014-02-27 08:35:52 +01:00
Luke Page
beb52739c0 allow % to be passed to the unit function. Fixes #1550 and fixes #1571 2014-02-23 17:09:33 +00:00
Luke Page
7c90acaae6 Fix a small scope issue with mixins when using parent selectors, introduced in 1.6.2. Fixes #1877 2014-02-21 11:22:42 +00:00
Luke Page
bf9c59025b Fixed that in some situations a mixin call into a referenced file wouldn't import media queries. Fixes #1469 2014-02-21 11:03:38 +00:00
Roel van Duijnhoven
86fee0d185 Add test case were luminance is not equal to luma. 2014-02-21 08:51:19 +01:00
Roel van Duijnhoven
4952b66b3c Let tests reflect output of new luma function. 2014-02-21 08:49:34 +01:00
Luke Page
8fa966ea18 Merge pull request #1859 from less/detached-rulesets
detached rulesets
2014-02-19 07:07:48 +00:00
seven-phases-max
768a5cbc84 minor % func improvement: preserve quote char and escaped flag, updated tests. 2014-02-18 18:56:46 +04:00
Luke Page
6117a33f50 Merge pull request #1855 from jakebellacera/adding_replace_function
Adding replace function
2014-02-17 22:32:27 +00:00
Luke Page
baba33ea6a Fix some bugs with detached rulesets and media queries 2014-02-17 19:15:47 +00:00
Luke Page
c730829d1d Fix one issue with media queries and detached rulesets, one to go 2014-02-16 17:50:51 +00:00
Luke Page
b46ca11286 error tests and test detached rulesets without a mixin call 2014-02-13 21:42:32 +00:00
Luke Page
e0692fa199 add scope tests to the detached ruleset test-set 2014-02-13 20:36:34 +00:00
Luke Page
c301ea6e42 Merge remote-tracking branch 'origin/master' into detached-rulesets 2014-02-12 23:42:15 +00:00
Luke Page
e3576b9c01 implement n level back-tracking and then don't absorb a parenthesis, fixing both issues with 2 new test cases 2014-02-12 23:10:52 +00:00
Luke Page
55033c77ed more tests and name arguments for caller 2014-02-11 22:01:26 +00:00
Luke Page
9749d20c3d Fix tests, fix a bug in comparing values 2014-02-11 21:09:06 +00:00
seven-phases-max
68f97faf5d Fixed empty args matching for named variadics (e.g. .mixin(@var...)). 2014-02-11 19:25:20 +04:00
Luke Page
2be0b8c922 Merge remote-tracking branch 'origin/master' into detached-rulesets 2014-02-11 13:53:16 +00:00
Luke Page
f7414a1072 detached rulesets 2014-02-09 22:20:08 +00:00
seven-phases-max
09c4311594 Added support for variables in certain at-rules (keyframes, namespace, charset). 2014-02-09 13:42:01 +04:00
Jake Bellacera
98f48bcb78 Replacing replace's options to flags 2014-02-06 23:41:18 -08:00
Jake Bellacera
089bf1b78a Adding replace function
* renamed gsub function to replace
* reordered replace's function arguments to be much more readable
* added support for replacement (Regexp) options
2014-02-06 23:29:14 -08:00
Jake Bellacera
fda1774ddb Merge upstream into adding_gsub_function 2014-02-06 17:29:42 -08:00
seven-phases-max
c523e99622 Property merge via +_: minor test updates. 2014-02-05 00:54:20 +04:00
seven-phases-max
9f4818d8fd Added support for property merge via +_; 2014-02-04 06:54:05 +04:00
Matthew Ouyang
bb721e8a6b fix broken test case
- linenumbers-all.css had a hard-coded path instead of a parameterized one
2014-02-03 01:53:41 -05:00
Luke Page
38cca0471c make selector-less css guard fold into the current selector 2014-02-02 17:38:13 +00:00
Luke Page
eb19ae4cfa Fix bug with css guards. Fixes #1750. Fixes #1613. Fixes #1813 2014-02-01 19:13:56 +00:00
Luke Page
eba67deddf Merge branch 'property-interp-fix-2' of https://github.com/seven-phases-max/less.js
Conflicts:
	lib/less/parser.js
2014-02-01 18:33:58 +00:00
Luke Page
245717afaa Fix parser error with block comments. Fixes #1833 2014-02-01 08:42:10 +00:00
Luke Page
e18b274f62 Merge branch 'cache-buster' of https://github.com/bcluca/less.js
Conflicts:
	test/index.js
2014-01-22 21:19:57 +00:00
seven-phases-max
5146c1b1ee improved multiple default() guards conflict detection, updated tests. 2014-01-21 19:11:08 +04:00
Luca Bernardo Ciddio
d6244cb3f9 Renamed --cache-buster option to --url-args 2014-01-18 19:26:27 -08:00
seven-phases-max
52ba472bb7 Added rounding of output numbers (hardcoded to max. 8 digits in this commit). 2014-01-18 09:58:14 +04:00
Luca Bernardo Ciddio
958716160f Cache buster for url tokens 2014-01-16 21:12:56 -08:00
Luke Page
86476d58cb allow empty files 2014-01-12 11:51:02 +00:00
Luke Page
92c3ac2c88 support shadow dom selectors. fixes #1801 2014-01-11 17:43:19 +00:00