Commit Graph

426 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
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
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
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
8ddcf66a67 Merge branch 'color-string-variable' of https://github.com/seven-phases-max/less.js into 2_0_0 2014-02-13 22:43:53 +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