0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

54 Commits

Author SHA1 Message Date
Jacob Thornton
e659dc7e1b Merge branch '2.0.3-wip'
Conflicts:
	Makefile
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
2012-04-24 02:21:45 -07:00
Jacob Thornton
b8b1ffde05 hr to var in makefil 2012-04-23 04:16:27 -07:00
Jacob Thornton
03f78f7a60 run qunit tests in phantomjs for travis-ci 2012-04-19 17:34:07 -07:00
Jacob Thornton
1160935446 make a few changes to package.json (add make test to makefile) 2012-04-19 16:38:43 -07:00
Jacob Thornton
f89394b8ef make build prettier - hopefully this works, maybe some makefile bro's can improve 2012-04-18 22:49:31 -07:00
Jacob Thornton
edb52a82d8 make bootstrap compile with Recess instead of Less 2012-04-18 16:16:42 -07:00
Jacob Thornton
6cf9906a60 build bootstrap.js and bootstrap.min.js into docs 2012-04-15 17:03:33 -07:00
Jacob Thornton
6506ede632 add bootstrap + bootstrap.min.js to gh-pages for @remy 2012-04-15 16:45:13 -07:00
Jacob Thornton
e985681758 add zip to git ignore, and fix gh-pages make 2012-04-15 00:19:25 -07:00
Jacob Thornton
2a6894d834 simplify make - move zipping to gh-pages only 2012-04-15 00:16:09 -07:00
Jacob Thornton
c262ead6ed change comments to preserve for yui 2012-04-14 23:51:08 -07:00
Jacob Thornton
c7dc4cc573 change position of var in dropdown + cleanup makefile vars 2012-04-14 22:43:36 -07:00
Jacob Thornton
575f18aaf4 add jshint support + a few minor stylistic changes 2012-04-14 16:29:53 -07:00
Mark Otto
5591a9b966 use yui-compress by default instead of regular compress 2012-04-07 14:56:37 -07:00
Mark Otto
95cb6f07a8 Merge branch 'zerkms-master' into 2.0.2-wip
Conflicts:
	Makefile
2012-03-11 17:38:23 -07:00
Jonathan Maron
aa8e6b081c Fixed double copy action in Makefile. 2012-03-09 07:38:14 +01:00
Jacob Thornton
1562381114 remove non existent dist dir from phony makefil 2012-03-08 11:42:12 -08:00
Jacob Thornton
bcef12dfcc add version to min js 2012-03-08 11:39:00 -08:00
Jacob Thornton
e1deb4e767 fix makefile to reset zips 2012-02-01 22:27:46 -08:00
Mark Otto
54bfdf1183 fix the makefile 2012-02-01 18:24:41 -08:00
Jacob Thornton
59016d2198 only add the anyalytics to production 2012-02-01 16:38:58 -08:00
Jacob Thornton
fd49d4a44f move examples into docs... 2012-01-31 17:35:23 -08:00
Jacob Thornton
80a752f525 add makefile to make it easier to publish to gh-pages... 2012-01-31 14:05:30 -08:00
Jacob Thornton
390a9af936 move js stuff into assets 2012-01-31 13:58:28 -08:00
Jacob Thornton
298e637d00 remove dist dir 2012-01-29 16:33:29 -08:00
Jacob Thornton
49d565a6da move building zip file into docs/makefile 2012-01-29 13:15:37 -08:00
Jacob Thornton
616cbf93d2 remove uglify variable from makefile 2012-01-28 14:47:59 -08:00
Jacob Thornton
15d3a4797f simplify build process more - remove really annoying date. 2012-01-27 21:06:09 -08:00
Jacob Thornton
815a2ae9f2 rebuild + copy images to docs when making 2012-01-26 22:39:17 -08:00
Jacob Thornton
ed64276e5b move doc building into base make method + build bootstrap to doc assets 2012-01-26 22:05:45 -08:00
Jacob Thornton
dc2deb9a1b moving structure around + more work on builder... 2012-01-26 21:48:46 -08:00
Mark Otto
9553b1e3e9 update docs to include separate responsive css, update docs to highlight proper file name, updated makefile to build responsive separately 2012-01-25 10:02:52 -08:00
Marc Chung
54f04d3b13 Fixed typo in Makefile 2012-01-24 12:37:57 -07:00
Jacob Thornton
f764aee4b9 add templates for doc generation 2012-01-23 14:14:16 -08:00
Jacob Thornton
6f2f947a43 add build tool for js + rename twipsy to tooltip + lots of little doc cleanup 2012-01-11 21:42:55 -08:00
Mark Otto
5801c4d766 capitalize Less in makefile, add print less file (not yet compiled) 2011-12-27 13:51:50 -06:00
Jacob Thornton
076370f3f9 fix for linux 2011-12-24 22:31:39 -08:00
Jacob Thornton
6d5b506517 minor cleanups 2011-12-21 17:38:05 -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
Jacob Thornton
bc65b58551 merge in js from 1.4... start working through js docs 2011-11-20 20:58:04 -08:00
Jacob Thornton
c7c5ce8dcd Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
2011-09-16 11:24:07 -07:00
Jacob Thornton
472632ba51 mv 1.3.0 file names to plane bootstrap.css for submodulers 2011-09-15 23:09:56 -07:00
Jacob Thornton
997c2cd6a0 make file shouldn't say file built successfully if error occurs 2011-09-12 14:28:26 -07:00
Mark Otto
1c03a07591 bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere 2011-09-08 10:36:56 -07:00
yury
fe8cb55cc1 use @VERSION var in build script 2011-09-03 20:10:42 +04:00
Jacob Thornton
4fb1c5bd4b rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html 2011-08-30 23:34:19 -07:00
Jacob Thornton
273659c8e7 update everything to 1.1.1 2011-08-26 11:13:47 -07:00
Jacob Thornton
3ef86aa703 v1.1.0 2011-08-21 22:30:39 -07:00
Jacob Thornton
7f99892b86 change popover stufff 2011-07-28 17:50:38 -07:00
Jacob Thornton
088bfcc13a add formal checks to makefile to make sure people have neccessary software installed
add date to built file!
2011-07-02 10:45:59 -07:00