diff options
| author | Mark Otto <[email protected]> | 2012-08-15 09:36:35 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-15 09:36:35 -0700 |
| commit | 74bda55d4caa3fd68b5993e5301cf2cc03fb48e8 (patch) | |
| tree | 2d245f9fd1b6d5f9ba3697407aaa701267bd3f6a | |
| parent | b0437bef7659c758398abd548fdee68e042cb336 (diff) | |
| parent | 6a1521327b207b0043095f09511d43ddea5f7b25 (diff) | |
| download | bootstrap-74bda55d4caa3fd68b5993e5301cf2cc03fb48e8.tar.xz bootstrap-74bda55d4caa3fd68b5993e5301cf2cc03fb48e8.zip | |
Merge pull request #4406 from mikaelkael/fix/add-affix-to-compilation
Add affix.js to javascript compilation
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ build: @cp js/*.js docs/assets/js/ @cp js/tests/vendor/jquery.js docs/assets/js/ @echo "Compiling documentation... ${CHECK} Done" - @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > docs/assets/js/bootstrap.js + @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js @echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js |