kylefang/sass
1
0
Fork 0
mirror of https://github.com/zhigang1992/sass.git synced 2026-01-12 17:52:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,901 Commits 12 Branches 165 Tags
stable
Commit Graph

144 Commits

Author SHA1 Message Date
Nathan Weizenbaum
856778db45 Watch for updates on port 3124. 2010-09-21 23:26:06 -07:00
Nathan Weizenbaum
80c3b87eac Excise Haml from within files. 2010-08-22 21:06:28 -07:00
Nathan Weizenbaum
e448aad974 Get rid of individual Haml-specific files. 2010-08-22 20:54:28 -07:00
Nathan Weizenbaum
3024c9b3b5 Bump VERSION to 3.0.14. 2010-07-26 13:51:25 -07:00
Nathan Weizenbaum
5130a84c6f [Emacs] Support tab indentation. 
Closes gh-204
 2010-07-19 20:48:16 -07:00
Nathan Weizenbaum
39176452d6 Bump VERSION to 3.0.13. 2010-06-23 14:31:03 -07:00
Nathan Weizenbaum
ff207e8488 [Emacs] Fix the list of lines that can't be indented under in Sass. 2010-06-15 14:52:20 -07:00
Nathan Weizenbaum
b65432728d [Emacs] Fix sass-indent-p. 2010-06-15 14:46:34 -07:00
Nathan Weizenbaum
59c58f052c Bump VERSION to 3.0.10. 2010-06-07 00:21:55 -07:00
Nathan Weizenbaum
547b2a0583 [Emacs] Properly highlight single-quoted strings. 
This was markedly easier than I thought it would be.
Now I feel silly for putting it off for so long.

Closes gh-33
 2010-06-06 00:41:49 -07:00
Nathan Weizenbaum
5d8ebb94ae Bump VERSION to 3.0.0. 2010-05-10 04:37:26 -07:00
Nathan Weizenbaum
6324cfe058 Merge branch 'stable' 
Conflicts:
	VERSION
	doc-src/HAML_CHANGELOG.md
	doc-src/SASS_CHANGELOG.md
 2010-03-12 22:28:50 -08:00
Nathan Weizenbaum
80d71ef207 Bump VERSION to 2.2.21. 2010-03-12 22:23:30 -08:00
Nathan Weizenbaum
cf4b8bdc14 Merge branch 'stable' 2010-02-18 13:45:37 -08:00
Steve Purcell
11636902d4 [Emacs] Use the font-lock rules from Emacs 23's bundled js.el for javascript filter blocks if available 2010-02-18 13:45:31 -08:00
Nathan Weizenbaum
a7422555ca Merge branch 'stable' 
Conflicts:
	VERSION
	doc-src/HAML_CHANGELOG.md
	doc-src/SASS_CHANGELOG.md
 2010-02-15 18:10:34 -08:00
Nathan Weizenbaum
8a7a829b11 Bump VERSION to 2.2.20. 2010-02-15 18:08:46 -08:00
Nathan Weizenbaum
0bef8b27f2 Merge branch 'stable' 2010-02-09 11:46:45 -08:00
Nathan Weizenbaum
83eb38704b [Emacs] Don't die if the optional fontification libraries aren't available. 
Closes gh-87
 2010-02-09 11:46:27 -08:00
Nathan Weizenbaum
a7bb39624c Merge branch 'stable' 
Conflicts:
	VERSION
 2010-02-04 21:17:16 -08:00
Nathan Weizenbaum
d0f3946ba1 Bump VERSION to 2.2.18. 2010-02-04 21:16:41 -08:00
Nathan Weizenbaum
6055993965 Merge branch 'stable' 
Conflicts:
	extra/haml-mode.el
	lib/haml/helpers.rb
	lib/sass/script/lexer.rb
	lib/sass/script/parser.rb
	test/sass/script_test.rb
 2010-02-03 02:41:10 -08:00
Nathan Weizenbaum
0f0df2003b [Emacs] Make documentation on new font stuff checkdoc-compatible. 2010-02-02 14:38:26 -08:00
Steve Purcell
94a8228e86 [Emacs] Support font-locking in haml-mode :filter blocks. 2010-02-02 12:20:25 -08:00
Nathan Weizenbaum
ec1e894f45 Merge branch 'stable' 
Conflicts:
	VERSION
	doc-src/HAML_CHANGELOG.md
	doc-src/SASS_CHANGELOG.md
 2009-10-08 17:10:38 -07:00
Nathan Weizenbaum
25e06a126d Bump the VERSION to 2.2.7. 2009-10-08 17:09:42 -07:00
Nathan Weizenbaum
964f37de54 Merge branch 'stable' 2009-10-04 17:41:35 -07:00
Nathan Weizenbaum
f49cdd3b3e Merge branch 'stable' of git@github.com:nex3/haml into stable 
Conflicts:
	Rakefile
 2009-10-04 17:41:12 -07:00
Nathan Weizenbaum
306ccaa4ec [Emacs] Make sass-mode require haml-mode. 2009-10-04 17:28:06 -07:00
Nathan Weizenbaum
87ecc8f719 Merge branch 'stable' 
Conflicts:
	VERSION
	doc-src/HAML_CHANGELOG.md
	doc-src/SASS_CHANGELOG.md
 2009-09-27 22:58:20 -07:00
Nathan Weizenbaum
855de4ac88 Bump version to 2.2.6. 2009-09-27 22:56:30 -07:00
Nathan Weizenbaum
9e67aec523 Merge branch 'stable' 
Conflicts:
	doc-src/HAML_CHANGELOG.md
 2009-09-21 14:43:13 -07:00
Nathan Weizenbaum
50e5e52ea9 [Emacs] Set version numbers to 2.2.5, in sync with current Haml version. 2009-09-21 12:28:31 -07:00
Gustavo Delfino
a523509106 [Emacs] Removed Last-Updated and RCS headers. 2009-09-21 12:28:19 -07:00
Gustavo Delfino
1e5c070f98 [Emacs] Updated header info in preparation for ELPA submission. 2009-09-21 12:28:06 -07:00
Nathan Weizenbaum
4d2f41f45a [Emacs] Fix up all the checkdoc errors in sass-mode. 2009-09-21 12:23:12 -07:00
Nathan Weizenbaum
d3bdfb6f93 [Emacs] Fix up all the checkdoc errors in haml-mode. 2009-09-21 12:23:08 -07:00
Nathan Weizenbaum
2c11b40b40 Get rid of another haml-mode warning. 2009-08-27 21:53:58 -07:00
Nathan Weizenbaum
1810b98154 Get rid of a compile error in haml-mode. 2009-07-27 22:41:55 -07:00
Nathan Weizenbaum
b21d496618 [Emacs] Remove a warning. 2009-07-18 11:48:38 -07:00
Nathan Weizenbaum
859a35946a [Emacs] Fix Sass variable parsing. 2009-07-05 01:51:40 -07:00
Nathan Weizenbaum
5709b7082a Fix up some update-watcher stuff. 2009-07-04 16:26:25 -07:00
Nathan Weizenbaum
99f21fb8a2 Merge branch 'master' into new-attrs 
Conflicts:
	TODO
	test/haml/engine_test.rb
 2009-07-01 23:27:29 -07:00
Nathan Weizenbaum
8b1ae1f96e Trace all invoked rake tasks. 2009-06-25 00:55:06 -07:00
Nathan Weizenbaum
f0e273ba34 Merge branch 'master' into new-attrs 2009-06-18 13:08:49 -07:00
Nathan Weizenbaum
458306fb35 Delegate update-handling to the Rakefile. 2009-06-17 21:46:25 -07:00
Nathan Weizenbaum
00c3f79a99 Make the watcher update the Haml and Sass pages when the respective branches are updated. 2009-06-17 21:25:23 -07:00
Nathan Weizenbaum
e63250a20f Merge branch 'master' into new-attrs 2009-06-01 00:50:30 -07:00
Nathan Weizenbaum
e1817a03bf [Emacs] Properly highlight Sass stuff with underscores. 2009-05-27 11:38:40 -07:00
Nathan Weizenbaum
9503ed1b89 [Emacs] Fix some edge cases. 2009-05-25 01:57:13 -07:00