Commit Graph

1904 Commits

Author SHA1 Message Date
Luke Page
953f70c879 Fix browser tests 2014-08-14 18:08:31 +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
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
5d406c4dd7 simplify readme - remove build system and add version badge instead 2014-08-14 17:09:41 +01:00
Luke Page
a16aff18b9 update dependencies 2014-08-14 17:04:51 +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
Luke Page
45e2b8aaaf Merge pull request #2144 from pdehaan/patch-1
Updating request dependency
2014-08-14 15:53:23 +01:00
Peter deHaan
6089b66017 Updating request dependency
see https://nodesecurity.io/advisories/qs_dos_extended_event_loop_blocking and mikeal/request#993
2014-08-12 11:18:22 -07: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
Luke Page
93d6b0876e Merge pull request #2123 from SomMeri/import-into-media-1645
Import into media 1645
2014-07-28 14:08:50 +01: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
83a8625284 Merge https://github.com/less/less.js into rhino 2014-07-28 11:20:15 +02:00
Luke Page
a168b1f638 1.7.4 release v1.7.4 2014-07-27 21:04:20 +01: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
9fab6160a0 Merge branch 'master' of https://github.com/less/less.js 2014-07-27 16:57:07 +01:00
Luke Page
1ff24b4c26 do not use util.print since it is deprecated. Fixes #2081 2014-07-27 16:56:46 +01:00
Luke Page
dfa3f6abfb Merge pull request #2100 from joscha/patch-1
Update bower for 1.7.3
2014-07-27 16:21:36 +01:00
Luke Page
4ec83bc940 Merge branch 'master' of github.com:MiguelCastillo/less.js 2014-07-27 16:19:16 +01:00
Luke Page
d750151536 Found race condition that caused file not to be skipped in importOnce, leading to random exceptions. Fixes #1931 2014-07-27 16:09:17 +01:00
Luke Page
4b40773f64 Merge pull request #2121 from SomMeri/font-face-property-merge-2-2035
Properties merging should work also inside directives #2035
2014-07-27 15:23:27 +01:00
Luke Page
ff6fe91d47 Merge pull request #2120 from SomMeri/misleading-error-message-2069
Misleading error message 2069
2014-07-27 15:22:02 +01:00
jurcovicovam
86c0beb8b4 Merge https://github.com/less/less.js into rhino 2014-07-27 14:19:36 +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
95beef2135 Merge https://github.com/less/less.js into misleading-error-message-2069
Conflicts:
	test/sourcemaps/basic.json
2014-07-27 13:50:40 +02:00
Luke Page
1b204fe230 Merge pull request #2117 from SomMeri/import-charset-ordering-2013-1954
Fix ordering of @import and @charset rules #1954 #2013
2014-07-27 10:57:25 +01:00
jurcovicovam
f565860599 Putting readme.md into its original state. Also, travis failed with weird
message and I want to see what it will do this time.

Previous travis error:
>> PhantomJS has crashed. Please read the crash reporting guide at
>> https://github.com/ariya/phantomjs/wiki/Crash-Reporting and file a bug
>> report at https://github.com/ariya/phantomjs/issues/new with the crash
>> dump file attached: /tmp/7685d81d-94f5-1db7-12c9006e-72f80442.dmp 0 [
>> 'PhantomJS has crashed. Please read the crash reporting guide at
>> https://github.com/ariya/phantomjs/wiki/Crash-Reporting and file a bug
>> report at https://github.com/ariya/phantomjs/issues/new with the crash
>> dump file attached: /tmp/7685d81d-94f5-1db7-12c9006e-72f80442.dmp' ]
2014-07-26 00:32:41 +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
0145a547cb Merge https://github.com/less/less.js into rhino
Conflicts:
	README.md
2014-07-26 00:17:59 +02:00
jurcovicovam
d44a524b92 Raise error in case of an empty selector inside :extend. 2014-07-25 22:35:51 +02:00
jurcovicovam
bfdc28cdb1 Merge https://github.com/less/less.js into misleading-error-message-2069
Conflicts:
	README.md
2014-07-25 22:25:44 +02:00
jurcovicovam
f4d0442dbc Removing useless comments. 2014-07-24 14:13:43 +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
Miguel Castillo
b7224670c9 Adding handling for upper case drive letter in Windows
The check fails when the path starts with a Windows letter drive that’s
upper case, causing the path to then include the currentDirectory.
This fails when a rootPath is specified along with an import statements
like:

@import url("brackets_colors.less");
2014-07-11 18:36:03 -04:00
Joscha Feth
085d4e74ad Update bower for 1.7.3 2014-07-09 15:43:55 +02:00
Luke Page
546bedd344 1.7.3 release v1.7.3 2014-06-22 16:12:14 +01: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
9e323a43fd Merge pull request #2062 from seven-phases-max/not-rounded-color-queries
Don't round values returned by colour query functions.
2014-06-22 10:56:13 +01:00
Luke Page
aeacf5754a missing distribution files v1.7.2 2014-06-22 10:44:08 +01:00
Luke Page
73c34ac24f improve some of the error messages when not using the chunker. 2014-06-22 10:43:05 +01:00