kylefang/sass
1
0
Fork 0
mirror of https://github.com/zhigang1992/sass.git synced 2026-06-12 00:54:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,692 Commits 12 Branches 165 Tags
sourcemap-options
Commit Graph

1383 Commits

Author SHA1 Message Date
Nathan Weizenbaum
d978423377 Enable sourcemaps by default. 
This also adds support for customizing sourcemap links on the command
line and via the Ruby option API.

Closes #1189
 2014-06-13 18:17:10 -07:00
Nathan Weizenbaum
f701698fde Add a CHANGELOG entry about selector functions. 2014-06-13 15:13:09 -07:00
Nathan Weizenbaum
783a3098c0 Merge branch 'stable' 
Conflicts:
	doc-src/SASS_CHANGELOG.md
	lib/sass/exec.rb
 2014-06-13 13:43:18 -07:00
Nathan Weizenbaum
21366e5f2e Add a changelog entry for File.exists? 2014-06-13 13:25:37 -07:00
Nathan Weizenbaum
3b8f8135f0 Merge remote-tracking branch 'origin/stable' into stable 2014-06-13 13:23:10 -07:00
Nathan Weizenbaum
fb838e5b7a Merge remote-tracking branch 'origin/stable' into stable 2014-06-13 12:41:36 -07:00
Jannik Zschiesche
9010f6a41a Fixed small documentation issue (in @at-root) 
Fixes #1283
 2014-06-13 10:42:33 +02:00
Nathan Weizenbaum
2a69d19873 Add a changelog entry. 2014-06-06 17:30:53 -07:00
Nathan Weizenbaum
9e58d2ec89 Disallow functions named "and", "or", or "not". 
Closes #1265
 2014-06-06 13:19:13 -07:00
Chris Eppstein
a76cb3f006 Fix markdown syntax mistake. 2014-06-05 09:02:40 -07:00
Chris Eppstein
f2553d3f22 Clarify how colors work in the sass reference. 2014-06-05 08:59:23 -07:00
Chris Eppstein
37464b4455 Clarify that any value can be a legal key in a Sass map. 2014-06-05 08:38:55 -07:00
Nathan Weizenbaum
eb42765a4c Merge branch 'stable' 
Conflicts:
	VERSION
	doc-src/SASS_CHANGELOG.md
 2014-05-30 17:37:36 -07:00
Nathan Weizenbaum
a2fd37ed1b Bump VERSION to 3.3.8. 2014-05-30 17:35:20 -07:00
Nathan Weizenbaum
00c460c2ae Merge remote-tracking branch 'origin/stable' into stable 2014-05-30 17:34:44 -07:00
Nathan Weizenbaum
b875485ab1 Merge branch 'stable' 
Conflicts:
	lib/sass/selector/comma_sequence.rb
	lib/sass/selector/sequence.rb
	test/sass/scss/scss_test.rb
 2014-05-30 13:25:26 -07:00
Nathan Weizenbaum
457078bfba Merge pull request #1261 from Snugug/stable 
Updated Number Operations to include Unit Math
 2014-05-30 13:11:14 -07:00
Nathan Weizenbaum
274cd1b9be Fix @media interpolation errors. 
Closes #1260
 2014-05-30 13:09:46 -07:00
Nathan Weizenbaum
1675d6796f Fix a sass-convert comma-folding bug. 
Closes #1257
 2014-05-30 12:54:40 -07:00
Snugug
6b3251135f Updated Number Operations for Unit Math 
See [multiplication error](https://github.com/nex3/sass/issues/83). This comes up all the time and the current documentation implies that Sass will do unit conversion for them for everything.
 2014-05-30 14:32:38 -05:00
Nathan Weizenbaum
1085c2e0d6 Merge branch 'stable' 
Conflicts:
	VERSION
	doc-src/SASS_CHANGELOG.md
	test/sass/scss/scss_test.rb
 2014-05-09 13:54:39 -07:00
Nathan Weizenbaum
b5c2c536d0 Don't split a block with @at-root unless necessary. 
Closes #1239
 2014-05-09 13:27:09 -07:00
Nathan Weizenbaum
03fe0c9b95 Bump VERSION to 3.3.7. 2014-05-02 17:22:23 -07:00
Nathan Weizenbaum
fd4508b89a Merge branch 'stable' 
Conflicts:
	doc-src/SASS_CHANGELOG.md
 2014-05-02 16:13:15 -07:00
Nathan Weizenbaum
785f920b99 Merge branch 'source-range-calc' into stable 
Conflicts:
	doc-src/SASS_CHANGELOG.md

Closes #1236
 2014-05-02 16:10:03 -07:00
Nathan Weizenbaum
2833775452 Add a changelog entry. 2014-05-02 16:09:43 -07:00
Nathan Weizenbaum
1059b9871a Properly set default options in Rails 3.0. 
Closes #1235
 2014-05-02 15:34:21 -07:00
Nathan Weizenbaum
72b0062827 Fix a documentation bug. 
Closes #1234
 2014-05-02 15:23:52 -07:00
Nathan Weizenbaum
c24ed3c30a Follow the CSS spec when parsing strings. 
Closes #1237
 2014-05-02 15:08:34 -07:00
Nathan Weizenbaum
5f1f28d154 Merge branch 'stable' 2014-05-02 14:37:41 -07:00
₍˄ุ.͡˳̫.˄ุ₎
ebb8ec07cd Fix minor misspelling. 2014-04-26 13:58:46 -07:00
Nathan Weizenbaum
3835bf3d81 Merge branch 'stable' 
Conflicts:
	VERSION
	doc-src/SASS_CHANGELOG.md
 2014-04-25 18:19:59 -07:00
Nathan Weizenbaum
4e1d0ce421 Bump VERSION to 3.3.6. 2014-04-25 18:17:28 -07:00
Nathan Weizenbaum
fd0718d612 Fix another comment-parsing bug. 
Closes #1228
 2014-04-25 14:42:48 -07:00
Nathan Weizenbaum
fb36e6503c Fix a comment-parsing bug. 
Closes #1226
 2014-04-25 14:06:44 -07:00
Nathan Weizenbaum
d45d0d2365 Respect CSS "/" in Number#inspect. 
Closes #1229
 2014-04-25 13:41:51 -07:00
Nathan Weizenbaum
5369e18e10 Merge branch 'stable' 
Conflicts:
	VERSION
	doc-src/SASS_CHANGELOG.md
 2014-04-14 19:36:54 -07:00
Nathan Weizenbaum
48f303ddde Bump VERSION to 3.3.5. 2014-04-14 19:36:30 -07:00
Nathan Weizenbaum
f04b2d0688 Merge branch 'dont-freeze-true-false' into stable 
Conflicts:
	doc-src/SASS_CHANGELOG.md

Closes #1210
 2014-04-11 13:00:04 -07:00
Nathan Weizenbaum
ded47cb13e Add a changelog entry. 2014-04-11 12:59:39 -07:00
Nathan Weizenbaum
dafaa32451 Avoid unnecessary interpolation in sass-convert. 
Closes #1208
 2014-04-11 12:43:14 -07:00
Nathan Weizenbaum
ac554ff53d Support scientific notation and identifier units in numbers. 
Closes #1020
 2014-04-04 16:54:57 -07:00
Nathan Weizenbaum
25c4b18f08 Merge branch 'stable' 2014-04-04 15:40:41 -07:00
Nathan Weizenbaum
0cc2437141 Properly parse negative numbers preceded by a comment. 
This follows the CSS Syntax Level 3 spec for how unary minus is parsed.

See #1020
 2014-04-04 15:40:06 -07:00
Nathan Weizenbaum
48f29f8e10 Merge branch 'stable' 2014-04-04 14:00:36 -07:00
Nathan Weizenbaum
b1a20d35ca Merge remote-tracking branch 'origin/stable' into stable 2014-04-04 14:00:29 -07:00
Nathan Weizenbaum
c7fcc59dbe Merge branch 'stable' 
Conflicts:
	doc-src/SASS_CHANGELOG.md
 2014-04-04 13:13:49 -07:00
Nathan Weizenbaum
66f4e76e4c Bundle a fork of listen that falls back to polling. 
Closes #1191
 2014-04-04 12:49:45 -07:00
Trambitskiy Yura
c50bbf788e corrected a small misprint in opacify/transparentize description 2014-04-01 14:20:22 +04:00
Nathan Weizenbaum
2b87b837b7 Update encoding support to match the Syntax Level 3 spec. 
This also changes the Sass output to always be UTF-8. Non UTF-8
encodings were already broken with source maps, and there was no good
way to fix them.

See #1020
 2014-03-25 18:52:13 -07:00