Arnold Daniels
695c18090a
Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j4
...
Fixed variables when loading custom.json
Conflicts:
Makefile
README.md
component.json
composer.json
docs/assets/css/bootstrap-responsive.css
docs/assets/js/application.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/javascript.html
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-typeahead.js
package.json
2013-02-20 02:16:44 +01:00
Mark Otto
f74990d898
Version bump
2012-12-22 16:10:06 -08:00
fat
818c56f078
rewrite makefile to make a bit more "efficient" + rebuild
2012-12-21 17:42:24 -08:00
fat
5bd8cdca91
remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install
2012-12-19 21:36:50 -08:00
Mark Otto
529ecc5a77
Version bump
2012-12-10 18:31:04 -08:00
Arnold Daniels
a226b2d889
Improving customize
...
Fixed minor issues docs (iconic-search, upload button) Fixes #24
Renamed 'fonts' dir to 'font' (for compatibility with font awesome)
Allow loading custom.json (generated by bootstrap-server 2.0)
Select all CSS for selected js with 1 option
Update customize for no jasny less dir
2012-12-07 17:48:27 +01:00
Arnold Daniels
ccf9dd944f
Preparing for Boostrap-server 2.0
2012-12-06 20:21:02 +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
Kyle A. Matheny
fe8df5022b
Update Makefile
...
Fixed both instances of uglifyjs usage.
2012-11-28 23:33:05 +00:00
Mark Otto
79b7017227
version bump
2012-11-05 09:32:48 -08:00
fat
3b3dd3ac3c
2.2.1 - hotfix for carousel
2012-10-30 21:59:56 -07:00
fat
31c1eba51b
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
...
Conflicts:
bootstrap/css/bootstrap.css
bootstrap/css/bootstrap.min.css
2012-10-29 21:28:17 -07:00
fat
92e7f166e7
remove haunt, remove bootstrap dir, add bower support
2012-10-29 21:27:34 -07:00
Mark Otto
41ad16fe40
v2.2.0 instead of v2.1.2
2012-10-29 21:00:53 -07: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
Arnold Daniels
ee0c1b4c62
Merge remote-tracking branch 'twitter/master' into 2.1.0-j2-wip
2012-10-09 13:37:41 +02:00
Mark Otto
08b8571cb8
version bump to get this started
2012-09-05 10:00:57 -07:00
Arnold Daniels
04c7c677f4
Documented file upload + upload button
...
Added bootstrap-fileupload.js to Makefile
Added jasny/fileupload.less to jasny/bootstrap.less
2012-09-05 11:46:17 +02:00
Arnold Daniels
c8f966f290
Documented Row link js
...
Added bootstrap-rowlink.js to Makefile
Added jasny/rowlink.less to jasny/bootstrap.less
2012-09-05 11:46:17 +02:00
Arnold Daniels
4529e0928c
Documented inputmask javascript plugin
...
Added bootstrap-inputmask.js to Makefile
2012-09-05 11:46:17 +02:00
Arnold Daniels
47b8d13581
Documented iconic icons
...
Added jasny/iconic.less to jasny/bootstrap.less
Makefile also copies the fonts
2012-09-05 11:46:15 +02:00
Arnold Daniels
c42221762b
Added Jasny build process
2012-09-05 11:46:15 +02:00
♒∆✝
9d890a8412
Merge pull request #4810 from mainerror/2.1.1-wip
...
Makefile misses a 'clean' directive
2012-09-04 19:54:16 -07:00
Mark Otto
bf590d8c81
fixes #4958 : add version to minified js
2012-09-04 11:13:08 -07:00
Octavian Damiean
a976a1583c
Added 'clean' directive to the make file.
2012-08-29 13:24:00 +02:00
Jacob Thornton
320b75de63
add affix to zip
2012-08-20 23:13:43 -07:00
Mickael Perraud
6a1521327b
Add affix.js to javascript compilation
2012-08-15 10:56:52 +02:00
Jacob Thornton
77dea2c5eb
change haunt to write
2012-07-22 13:00:17 -07:00
Jacob Thornton
6c2fa9430c
add haunt w/ issue guideline spec
2012-07-22 12:57:39 -07:00
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
