Commit Graph

13 Commits

Author SHA1 Message Date
Arnold Daniels
eaad32b34f Added responsive tables 2012-12-14 16:27:33 +01:00
Arnold Daniels
176ab8f778 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip
Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
2012-11-29 23:58:46 +01:00
Arnold Daniels
9fcb8deb18 Use correct version in docs + readme + Makefile
Added the use of versions for Google analytics
Changed favicon
Modified package.json
2012-10-15 13:57:51 +02:00
Mark Otto
6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
rilian
80a645b52a optimizing images on 2.1.0-wip branch; saving couple of KBs from package 2012-08-06 13:23:12 +03:00
Mark Otto
9c1d8e032b change title attr to re-include twitter 2012-03-10 15:14:54 -08:00
Jacob Thornton
426feeef6a give pages custom titles based on names 2012-03-08 11:09:33 -08:00
Jacob Thornton
59016d2198 only add the anyalytics to production 2012-02-01 16:38:58 -08:00
Jacob Thornton
0bfbe5058d Merge branch '2.0-wip'
Conflicts:
	.gitignore
	LICENSE
	Makefile
	bootstrap.css
	bootstrap.min.css
	docs/assets/js/application.js
	docs/assets/js/google-code-prettify/prettify.css
	docs/index.html
	docs/javascript.html
	examples/container-app.html
	examples/fluid.html
	examples/hero.html
	js/bootstrap-alerts.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tabs.js
	js/bootstrap-twipsy.js
	js/tests/index.html
	js/tests/unit/bootstrap-modal.js
	js/tests/unit/bootstrap-popover.js
	js/tests/unit/bootstrap-tabs.js
	lib/forms.less
	lib/mixins.less
	lib/patterns.less
	lib/scaffolding.less
	lib/tables.less
2012-01-31 13:18:34 -08:00
Jacob Thornton
748696a553 add missing paren 2012-01-27 14:44:05 -08:00
Jacob Thornton
8a2124faff only build mustache files 2012-01-27 14:43:41 -08:00
Jacob Thornton
82de03b67c start wrapping text in {{_i}} for translation 2012-01-23 19:55:00 -08:00
Jacob Thornton
f764aee4b9 add templates for doc generation 2012-01-23 14:14:16 -08:00