root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
5,289 Commits 105 Branches 92 Tags 675 MiB
Commit Graph

453 Commits

Author SHA1 Message Date
fat c54b8adb85 fixes #8814 2013-07-30 13:33:56 -07:00
fat 5ee2a221ca fixes #8816 2013-07-30 13:31:57 -07:00
liuyl 270316f140 fix transition end 2013-07-29 20:23:01 +08:00
Jacob Thornton a31c5cea42 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-28 22:16:17 -07:00
Jacob Thornton e5a7af36d5 fixes #8703 2013-07-28 22:14:43 -07:00
Chris Rebert 9c672c6b20 get jshint close to passing by updating .jshintrc settings 
I don't agree with these personally, but they jive with BS/@fat's JS code style.
The remaining jshint complaints are things that really actually should get fixed.
 2013-07-27 21:56:44 -07:00
fat cfa4ab90f3 fix scrollspy for window *and* children 2013-07-26 22:24:51 -07:00
fat 38044e55ae rebuild + fix #2539 2013-07-26 20:44:35 -07:00
fat e2d4cf5f68 change how collapse works - collapse, collapsing, and in 2013-07-26 20:34:39 -07:00
John-Philip Johansson 0d33455ef4 Replace Makefile with GruntJS 
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
 2013-07-26 00:39:14 -07:00
fat f5f04ae4a0 fix affix… 2013-07-25 23:30:13 -07:00
fat 0190128ebc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-25 21:34:02 -07:00
fat 15d9c82fc5 fix collapse event #8596 2013-07-25 21:33:26 -07:00
Jacob f1ddf7681c Merge pull request #8419 from hollensteiner/3.0.0-wip 
Replace position() with offset() in scrollspy.js
 2013-07-25 21:19:57 -07:00
Chris Rebert 90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Jacob Thornton e9c83647af fixes #8568 -- account for margins in offset 2013-07-24 20:57:26 -07:00
Jacob Thornton aad910465c fixes #8569 2013-07-24 20:21:23 -07:00
Jacob Thornton eaefed517a fixes #8399 w/ tests 2013-07-24 20:10:16 -07:00
Jacob Thornton 217eb988b8 add placement auto for tooltips + tests… kinda sad about this doe 2013-07-23 23:50:23 -07:00
Jacob Thornton 6841c50968 fixes #7814 2013-07-23 22:59:09 -07:00
Jacob Thornton 72d2661ff0 fixes #8232 2013-07-23 20:53:12 -07:00
Jacob Thornton faa00629c4 add additional carousel test 2013-07-23 18:56:00 -07:00
Jacob Thornton 68e87183a0 fixes #8134 2013-07-23 18:54:00 -07:00
Jacob Thornton f1009c19b3 revert collapse change + add emulateTransitionEvent to catch dead css transitions 2013-07-23 18:44:08 -07:00
Jacob Thornton 43e5e90a6d shown.bs.modal fix 2013-07-23 17:32:20 -07:00
Jacob Thornton 7b12a0dcbc fixes #7970 2013-07-23 17:23:02 -07:00
fat 4b40ee692d cleaner way of preventing double click events + clean up tests for jshint 2013-07-18 01:07:11 -07:00
fat 37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
fat b13eecaeec fixes #7880 2013-07-17 23:52:29 -07:00
fat 59f847e8ee fixes #7777 2013-07-17 23:30:05 -07:00
fat 8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
fat 451acb42db fixes #7755 2013-07-17 23:15:50 -07:00
fat 57768d7ea9 fix #7660 2013-07-17 23:01:33 -07:00
fat 18d23b892c rebuild js + fixes #7583 2013-07-17 21:35:28 -07:00
fat 2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat a7a9a14379 fix @muan's unit test ;) 2013-07-17 21:17:39 -07:00
fat 102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-17 21:14:02 -07:00
fat eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
fat 392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
fat 13cad5061d maybe fix this old ass issue #5973 2013-07-17 19:28:43 -07:00
ClausH 0a72530429 Replace position with offset 2013-07-08 12:02:31 +02:00
Mu-An Chiou 55fa1acbd6 Tooltip: apply position class before positioning 2013-06-28 11:05:38 +01:00
Jacob d23800c828 Merge pull request #7424 from sody/3.0.0-wip 
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class.
 2013-06-27 22:36:33 -07:00
fat b0da97588e fixes #6982 2013-06-27 19:19:22 -07:00
Mark Otto 2aec6dae59 Fixes #7730: Better hiding of empty titles in popovers 
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.

/cc @fat becaue I probably did this wrong <3
 2013-06-20 16:02:05 -07:00
Ivan Khalopik e138b0df3a Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip 2013-06-10 10:31:51 +03:00
Robert Burns cc684750e5 Fix for carousel indicators 2013-06-01 08:15:40 -04:00
fat f5ce66177b fix event binding in modal.js 2013-05-29 11:24:00 -04:00
fat 9257bdc097 fixes #7163 2013-05-27 12:45:13 -07:00
Ivan Khalopik 3285f4c306 Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip 
Conflicts:
	js/bootstrap-collapse.js
 2013-05-27 11:06:31 +03:00