Skip to content

Commit

Permalink
Merge pull request #1342 from xzyfer/feat/libsass-3.3.3
Browse files Browse the repository at this point in the history 
Bump to latest libsass
  • Loading branch information
@xzyfer
xzyfer committed Jan 20, 2016
2 parents 38a37ee + ead80e0 commit cd70fbd
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/libsass
Submodule libsass updated 90 files
+1 −1 .editorconfig
+1 −0 .gitignore
+1 −1 LICENSE
+20 −14 Makefile
+0 −1 Makefile.conf
+3 −1 Readme.md
+19 −11 appveyor.yml
+2 −1,235 docs/api-importer-example.md
+10 −0 docs/build-with-autotools.md
+18 −0 docs/build-with-makefiles.md
+4 −1 include/sass/base.h
+2 −1 include/sass/values.h
+279 −346 src/ast.cpp
+234 −60 src/ast.hpp
+1 −0 src/base64vlq.cpp
+35 −45 src/bind.cpp
+1 −0 src/bind.hpp
+1 −0 src/color_maps.cpp
+4 −1 src/constants.cpp
+2 −1 src/constants.hpp
+41 −31 src/context.cpp
+10 −10 src/context.hpp
+7 −4 src/cssize.cpp
+1 −3 src/cssize.hpp
+73 −14 src/debugger.hpp
+37 −25 src/emitter.cpp
+10 −9 src/emitter.hpp
+16 −5 src/environment.cpp
+5 −3 src/environment.hpp
+91 −14 src/error_handling.cpp
+105 −4 src/error_handling.hpp
+519 −330 src/eval.cpp
+12 −13 src/eval.hpp
+92 −56 src/expand.cpp
+5 −3 src/expand.hpp
+60 −51 src/extend.cpp
+1 −3 src/extend.hpp
+37 −27 src/file.cpp
+78 −62 src/functions.cpp
+1 −0 src/functions.hpp
+293 −64 src/inspect.cpp
+2 −0 src/inspect.hpp
+1 −0 src/lexer.cpp
+14 −15 src/listize.cpp
+3 −5 src/listize.hpp
+1 −0 src/memory_manager.cpp
+2 −3 src/node.cpp
+70 −71 src/operation.hpp
+28 −32 src/output.cpp
+1 −2 src/output.hpp
+402 −183 src/parser.cpp
+19 −9 src/parser.hpp
+1 −0 src/plugins.cpp
+1 −0 src/position.cpp
+134 −56 src/prelexer.cpp
+51 −3 src/prelexer.hpp
+35 −9 src/remove_placeholders.cpp
+4 −3 src/remove_placeholders.hpp
+1 −0 src/sass.cpp
+129 −0 src/sass.hpp
+31 −14 src/sass_context.cpp
+2 −31 src/sass_context.hpp
+1 −0 src/sass_functions.cpp
+5 −6 src/sass_interface.cpp
+1 −2 src/sass_util.cpp
+5 −5 src/sass_util.hpp
+13 −10 src/sass_values.cpp
+4 −3 src/source_map.cpp
+2 −2 src/source_map.hpp
+0 −1 src/subset_map.hpp
+1 −0 src/to_c.cpp
+1 −3 src/to_c.hpp
+0 −48 src/to_string.cpp
+0 −38 src/to_string.hpp
+3 −5 src/to_value.cpp
+1 −1 src/to_value.hpp
+96 −59 src/units.cpp
+10 −8 src/units.hpp
+5 −0 src/utf8_string.cpp
+23 −156 src/util.cpp
+10 −14 src/util.hpp
+1 −0 src/values.cpp
+2 −6 test/test_node.cpp
+1 −3 test/test_selector_difference.cpp
+0 −2 test/test_specificity.cpp
+0 −2 test/test_superselector.cpp
+1 −3 test/test_unification.cpp
+18 −5 win/libsass.targets
+9 −7 win/libsass.vcxproj
+148 −106 win/libsass.vcxproj.filters
1 change: 0 additions & 1 deletion src/libsass.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
'libsass/src/sass_values.cpp',
'libsass/src/source_map.cpp',
'libsass/src/to_c.cpp',
'libsass/src/to_string.cpp',
'libsass/src/to_value.cpp',
'libsass/src/units.cpp',
'libsass/src/utf8_string.cpp',
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/source-map-embed/expected.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/fixtures/source-map/expected.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"sources": [
"index.scss"
],
"mappings": "AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAK,GACd;;AAED,OAAO,CAAC,EAAE,CAAC;EACT,eAAe,EAAE,IAAK,GACvB;;AAED,OAAO,CAAC,EAAE,CAAC;EACT,KAAK,EAAE,IAAK,GAKb;EAND,OAAO,CAAC,EAAE,CAGR,CAAC,CAAC;IACA,WAAW,EAAE,IAAK,GACnB",
"mappings": "AAAA,AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAK,GACd;;AAED,AAAQ,OAAD,CAAC,EAAE,CAAC;EACT,eAAe,EAAE,IAAK,GACvB;;AAED,AAAQ,OAAD,CAAC,EAAE,CAAC;EACT,KAAK,EAAE,IAAK,GAKb;EAND,AAGE,OAHK,CAAC,EAAE,CAGR,CAAC,CAAC;IACA,WAAW,EAAE,IAAK,GACnB",
"names": []
}
2 changes: 1 addition & 1 deletion test/fixtures/spec
Submodule spec updated 1411 files

0 comments on commit cd70fbd

Please sign in to comment.