1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Commit graph

14 commits

Author SHA1 Message Date
Mark Otto
96953c2072 update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg 2013-02-13 12:30:56 -08:00
Graham Conzett
178397ae5e Add 'dist' directory to .gitignore
Allows you to keep a 'dist' directory in the repository as a target build location.
This can be useful if you have bootstrap as a submodule in a project and want to build it,
but still keep it self-contained. Similar to how jQuery does their default builds:
https://github.com/jquery/jquery/#how-to-build-your-own-jquery
2012-07-30 14:10:01 -04:00
Chris Aniszczyk
c99dcd2e93 Add Travis CI Support
Continous integration is nice, fixes #3155

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
2012-04-19 16:09:59 -07:00
Jacob Thornton
e985681758 add zip to git ignore, and fix gh-pages make 2012-04-15 00:19:25 -07:00
Maxim Pshenichnikov
922b5fba53 ignore Apple Double files 2012-03-11 00:11:03 +04: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
f622822459 check in dist dir for hb5 + update images to point to correct spot for builder 2012-01-29 16:19:41 -08:00
Jacob Thornton
15d3a4797f simplify build process more - remove really annoying date. 2012-01-27 21:06:09 -08:00
Nicolas Gallagher
1c014613a9 Add various always-ignore extensions, files, and folders to .gitignore 2012-01-19 20:32:57 +00:00
Jacob Thornton
13a59a0124 remove js min from repo 2011-11-20 21:45:09 -08:00
Jacob Thornton
36a7eb3851 add build script for minified files and allow elements to be returned to getContent and title in popovers 2011-11-20 21:36:26 -08:00
Silumesii Maboshe
df773debab .gitignore update. 2011-10-07 06:02:02 +02:00
Jacob Thornton
f376de1319 fix local docs link + remove whitespace in gitignore 2011-08-18 11:27:45 -07:00
Jacob Thornton
7ecfc99a14 remove ds_store add an ugly gitignore file. boo. 2011-08-16 23:07:35 -07:00