Commit Graph

644 Commits

Author SHA1 Message Date
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
169bbada40 Merge pull request #2135 from SomMeri/charset-2126
Charsets should float on top #2126
2014-08-14 17:12:12 +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
e7c81125b7 Charsets should float on top #2126 2014-08-03 10:37:10 +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
Luke Page
0e883957cc tests for import malformed 2014-07-27 20:56:21 +01:00
Luke Page
1e04f3364d better error message when import missing a semi-colon or malformed. 2014-07-27 20:47:19 +01:00
Luke Page
1ff24b4c26 do not use util.print since it is deprecated. Fixes #2081 2014-07-27 16:56:46 +01: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
0efc25ac92 Source map changed together with import inline ordering 2014-07-22 17:06:04 +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
Luke Page
73c34ac24f improve some of the error messages when not using the chunker. 2014-06-22 10:43:05 +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
94f746b5e7 move some dependencies out of chunker. make chunker optional. start fixing error messages chunker handled 2014-06-19 18:23:19 +01: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
Luke Page
c872caa289 Merge pull request #1976 from peruginni/master
Added condition to check if HEX code contain only valid characters (issue #1015)
2014-06-06 08:11:50 +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
Ondřej Macoszek
a5406a939c Added another test case for missed space in color definition 2014-05-08 12:18:28 +02:00
Ondřej Macoszek
5b8b8def23 Added more flexible check for HEX color code. Also error is now less specific. 2014-05-08 12:12:06 +02:00
Luke Page
9ad5f181dc Switch to a different js error as the text is different in new versions of node 2014-05-06 06:35:01 +01:00
Luke Page
5647d4d276 Ignore quote type when comparing values. Fixes #1992 2014-05-06 06:20:07 +01:00
Ondřej Macoszek
31ffdb8c9f Added condition to check if HEX code contain only valid characters 2014-04-15 13:20:04 +02:00
seven-phases-max
8afeae92d3 Fixed recursive mixin regression, updated tests to detect such regression in future. 2014-03-19 05:55:11 +04:00
Luke Page
7dfc0cf9b0 Merge branch 'whitespace' of github.com:XhmikosR/less.js into 2_0_0
Conflicts:
	lib/less/functions.js
	lib/less/index.js
	lib/less/tree/anonymous.js
	lib/less/tree/media.js
	lib/less/tree/mixin.js
2014-03-02 12:36:49 +00:00
XhmikosR
7efbcd31cf Trim trailing whitespace. 2014-03-02 14:06:26 +02:00
Luke Page
2ac8617987 Fix the browser tests 2014-03-01 17:25:01 +00: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
0c8e117b85 update readme and rename LESS to Less 2014-02-27 20:22:47 +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
f65da55168 Fix tests 2014-02-24 09:40:18 +00: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
Luke Page
2a194e03d0 Merge branch 'master' of https://github.com/cloudchen/less.js
Conflicts:
	lib/less/browser.js
2014-02-23 08:30:50 +00:00
Luke Page
edd37294bf Fix scope test 2014-02-22 16:33:52 +00:00
Luke Page
f0d0ac965d Merge branch 'master' into 2_0_0
Conflicts:
	package.json
2014-02-22 15:31:32 +00:00
Luke Page
5ab0e08665 Do not evaluate css with guards if the guards fail. Fixes #1873 2014-02-21 12:37:40 +00:00