Commit Graph

449 Commits

Author SHA1 Message Date
Luke Page
6d64213996 Fix issue #2221 2014-10-11 18:51:09 +01:00
seven-phases-max
a51c8480ef Fix interpolated selector match regression 2014-10-04 20:19:50 +04:00
Luke Page
50e299b8bc Fix url import. Fixes #2089. 2014-09-07 14:40:28 +01:00
Luke Page
6bd327b3f4 Merge branch 'iterated-interpolation-2094' of github.com:SomMeri/less-rhino.js into 2_0_0
Conflicts:
	lib/less/tree/quoted.js
2014-09-06 14:39:32 +01:00
Luke Page
723b410db0 Merge branch 'SomMeri-namespaces-guards-1418' into 2_0_0
Conflicts:
	lib/less/tree/mixin.js
	lib/less/tree/ruleset.js
2014-09-06 13:27:11 +01:00
Luke Page
518887e9cc Merge branch 'namespaces-guards-1418' of github.com:SomMeri/less-rhino.js into SomMeri-namespaces-guards-1418 2014-09-06 02:09:51 +01:00
Luke Page
cf0ac69767 Merge branch 'reworked-guard-comparison' of github.com:seven-phases-max/less.js into 2_0_0
Conflicts:
	lib/less/tree.js
	lib/less/tree/anonymous.js
	lib/less/tree/color.js
	lib/less/tree/condition.js
	lib/less/tree/dimension.js
	lib/less/tree/keyword.js
	lib/less/tree/quoted.js
2014-09-06 01:52:47 +01:00
Luke Page
e31442cd63 Merge branch '2_0_0' of https://github.com/less/less.js into 2_0_0 2014-09-05 23:32:44 +01:00
Luke Page
f2bc59f63b Merge remote-tracking branch 'origin/master' into 2_0_0
Conflicts:
	CHANGELOG.md
	lib/less/index.js
	lib/less/parser/parser.js
	lib/less/tree/dimension.js
2014-09-05 23:31:42 +01:00
jurcovicovam
796d37cc66 Iterated string interpolation
Solves issue #2094 .
2014-09-05 16:47:37 +02:00
seven-phases-max
9f68f43552 Fix #1973 2014-09-05 14:11:03 +04:00
jurcovicovam
4a49c63696 Merge https://github.com/less/less.js into case-insensite-units-2096
Conflicts:
	test/css/comments.css
	test/less/comments.less
2014-09-05 10:08:54 +02:00
jurcovicovam
cbc8c78625 Added case insensitive units handling. Issue #2096 2014-09-05 10:05:13 +02:00
jurcovicovam
c330c3a4a8 Added guards checking to namespaces. Issue #1418. 2014-09-05 09:01:56 +02:00
seven-phases-max
c4e2514905 reworked guard comparison 2014-09-04 01:14:51 +04:00
Luke Page
8fc964dc34 Merge remote-tracking branch 'origin/master' into 2_0_0
Conflicts:
	lib/less/index.js
	lib/less/parser/parser.js
	lib/less/tree/rule.js
	test/less/property-name-interp.less
2014-09-03 07:36:20 +01:00
seven-phases-max
36383dc89b Fix property interpolation for @* values 2014-09-02 00:02:49 +04:00
Luke Page
e33d0b9b79 Fix missing ^, causing parse error. Fixes #2154 2014-08-27 18:02:45 +02:00
jurcovicovam
37ae8c4adb Fragment handling in data-uri function 1959
The change removes #fragment from filePath before readig the file and adds
it back to the end of the generated uri.
2014-08-27 18:02:44 +02:00
jurcovicovam
d086d64e12 Eat up comments instead of calling them parse error:
* in @keyframe declaration #2059,
* after rule name before semicolon #826.

The comments are eaten instead of being printed into output, but it is
better then crashing on them.
2014-08-27 17:50:33 +02:00
Luke Page
5d26a378e7 Merge branch 'master' into 2_0_0 2014-08-24 22:50:44 +01:00
Luke Page
c4ed7069e7 Fix missing ^, causing parse error. Fixes #2154 2014-08-24 22:43:11 +01:00
Luke Page
cde9b79b6c much improved comment parsing 2014-08-17 11:30:18 +01:00
Luke Page
ddba055461 Fix merge errors and node tests 2014-08-14 18:03:59 +01:00
Luke Page
f85f253586 merge from master 2014-08-14 17:27:16 +01:00
Luke Page
466bc39a10 Merge pull request #2136 from SomMeri/data-uri-1959
Fragment handling in data-uri function 1959
2014-08-14 17:13:25 +01:00
Luke Page
3735d8118c Merge pull request #2128 from SomMeri/issue-2127
Mixin wrongly called
2014-08-14 17:11:22 +01:00
Luke Page
7503268b6f Merge branch 'master' of https://github.com/less/less.js 2014-08-14 16:35:21 +01:00
Luke Page
74766691cc Support for /deep/ selector. Fixes #2023 2014-08-14 16:35:13 +01:00
jurcovicovam
0f8bd724f8 Fragment handling in data-uri function 1959
The change removes #fragment from filePath before readig the file and adds
it back to the end of the generated uri.
2014-08-03 13:20:02 +02:00
jurcovicovam
62eb799b40 Issue #2127, selectors matching function ignored * selector. 2014-07-29 15:36:24 +02:00
jurcovicovam
86c1b0d557 Fix interpolated import into media #1645
Media objects do not have ruleset property. They have rules property which
always contains one-member array with fake ruleset in it.
2014-07-28 13:15:50 +02:00
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
383027886c merge from master 2014-06-22 16:05:09 +01: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
Luke Page
fdd01f6b00 merge in latest 1.7.1 release 2014-06-10 19:30:21 +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
ee64392362 Merge branch 'master' into 2_0_0
Conflicts:
	lib/less/import-visitor.js
	lib/less/index.js
2014-02-27 21:12:49 +00: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
e8c78d9d40 Merge branch 'master' into 2_0_0
Conflicts:
	lib/less/browser.js
	lib/less/parser.js
2014-02-23 17:38:39 +00: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