root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity
3,700 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

263 Commits

Author SHA1 Message Date
Mark Otto 41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Jacob Thornton ba2a99e7c4 don't lookup typeahead when shift alt or ctrl are pushed 2012-10-17 23:39:41 -07:00
Jacob Thornton 45046544a6 when static, refocus on click 2012-10-17 23:36:22 -07:00
Jacob Thornton 0b9d4e78ad Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip 2012-10-17 23:06:58 -07:00
Jacob Thornton 7f3b94c453 Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document 
Conflicts:
	js/bootstrap-carousel.js
 2012-10-17 23:05:16 -07:00
billy gates d6ac499ca8 Merge pull request #5309 from erlendfh/dropdown-bugfix 
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
 2012-10-17 23:00:41 -07:00
Jacob Thornton 280d4aeb30 rebuild 2012-10-17 22:51:39 -07:00
Jacob Thornton edc3eee5ea fix carousel event 2012-10-17 22:26:44 -07:00
mfansler e24b46b7f3 fixes #5336: reorder focus() call to avoid scrolling 2012-10-16 12:27:43 -04:00
Erlend Halvorsen e9a648cd39 Fixed bug in dropdown toggle where menu would only clear on the first drop down 2012-09-27 10:31:40 +02:00
Jacob Thornton 0540b63ab0 check affix pos on clicks - use timeout for clicks which scroll 2012-09-24 23:59:02 -07:00
Jacob Thornton 88b1e44dd6 change tooltip/popover insert strategy 
remove modal-open class
hopefully resolve z-index headaches
 2012-09-24 23:28:38 -07:00
Jacob Thornton 003fcccceb change tooltip/popover html default to false for xss safety net 2012-09-24 23:15:36 -07:00
Jacob Thornton ebf94c53a5 change transition.js, rebuild… travis maybe will be happy? 2012-09-20 16:50:36 -07:00
Jacob Thornton fe38d12f12 rebuild - fix missing ( 2012-09-20 16:26:00 -07:00
Jacob Thornton 667179f406 added support for jquery 1.8.* 2012-09-20 16:23:54 -07:00
Mark Otto 08b8571cb8 version bump to get this started 2012-09-05 10:00:57 -07:00
Jacob Thornton c52368d3c5 last rebuild before 2.1.1 release 2012-09-04 20:44:11 -07:00
Mark Otto bf590d8c81 fixes #4958: add version to minified js 2012-09-04 11:13:08 -07:00
Mark Otto e27b1355b5 fixes #4771: widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0 2012-08-28 10:12:04 -07:00
Jacob Thornton 3568146b28 only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements 2012-08-27 21:44:09 -07:00
Mark Otto 7d412b1e14 fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests 2012-08-27 21:18:55 -07:00
Jacob Thornton 601e252074 fix for #4761 2012-08-27 20:58:51 -07:00
Jacob Thornton d797a5fbd7 fix for open elements under modal when .modal-open 2012-08-27 20:43:12 -07:00
Mark Otto 1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto 6477ad1acf fixes #4472: manually change mustache file as well for typo 2012-08-21 12:57:41 -07:00
Jacob Thornton 320b75de63 add affix to zip 2012-08-20 23:13:43 -07:00
Jacob Thornton 2b5e09038a small nits 2012-08-20 16:21:57 -07:00
Mark Otto e510306196 bump versions to 2.1.0 2012-08-19 23:07:18 -07:00
Mark Otto a667fd93ab pre font-size increase; revert static top navbar, undo contents section for now 2012-08-19 23:01:24 -07:00
Mark Otto 7ed82c1223 font-size change on examples in getting started 2012-08-19 11:59:28 -07:00
Jacob Thornton c9cef741f6 listen to touchstart for dropdowns on mobile 2012-08-18 20:18:15 -07:00
Jacob Thornton 45dddc59a1 add click option for tooltip, popover - make click default for popover 2012-08-18 19:54:30 -07:00
Jacob Thornton 1166b39630 removed some old stuff from application.js 2012-08-18 19:24:29 -07:00
Mark Otto 54c645e33d tweak transition 2012-08-15 14:49:55 -07:00
Jacob Thornton ff38c14948 stray ; 2012-08-14 21:23:29 -07:00
Jacob Thornton dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Mark Otto 9f8ce77751 running make on previous changes 2012-08-13 10:05:19 -07:00
Jacob Thornton 2b2b3303e1 fix indexof on array for ie8 2012-08-02 16:58:25 -07:00
Jacob Thornton 48546c2735 aria-labelledby="myModalLabel" aria-hidden="true" 2012-08-01 20:26:44 -07:00
Dirk Ginader 6977d35eed close #3531 added focus handling and removed the badly announced "times" close button from screenreaders 2012-08-01 20:11:16 -07:00
Jacob Thornton c10a357bb3 don't bite so hard 2012-07-24 12:57:00 -07:00
Jacob Thornton c98b75c979 added fade out on scroll - we can pull this if you prefer it 2012-07-24 00:48:45 -07:00
Jacob Thornton e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Mark Otto f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
 2012-07-23 23:01:38 -07:00
Jacob Thornton dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
Jacob Thornton fae6c36874 adds minLength #3960 2012-07-22 14:50:52 -07:00
Mark Otto a1ad6d124a Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip 
Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache
 2012-07-17 20:57:20 -07:00
Martin Bean 74b167b86d Moved JS to bottom as per best practices 2012-07-13 22:25:47 +01:00
Mark Otto c6ee96c025 fix up subnav styles, add subnav search form styles, add some basic docs for subnav 2012-07-05 10:37:23 -07:00
Mark Otto e7e183e55d Merge branch 'tekezo-patch-1' into 2.1.0-wip 2012-06-25 16:49:13 -07:00
Mark Otto 508a93d9e3 make fixing of subnav work again 2012-06-24 21:07:20 -07:00
Takayama Fumihiko e80f37b600 ".linenums .tag" should be ".prettyprint .tag". 2012-06-24 15:26:39 +09:00
Mark Otto 59153205b3 run make on js files 2012-06-20 23:46:29 -07:00
Jacob Thornton b2b000b750 change transition end name for opera 2012-06-20 10:40:56 -07:00
Mark Otto 860a96939a fix grid tooltips, tweaks 2012-06-07 10:58:15 -07:00
Mark Otto 8ee0679522 updated javascripts for first pass at single column 2012-06-05 18:25:46 -07:00
Jacob Thornton 82ea5847a7 adds remote source to modal. Remote source can be specified in href or by providing a remote option #936 2012-06-03 21:26:54 -07:00
Jacob Thornton 31e8a358c3 check length so that pause, actually pauses 2012-06-03 11:24:19 -07:00
Jacob Thornton 2d3a0babd2 make active selector more specific #2043 and rebuild 2012-06-02 22:10:35 -07:00
Jacob Thornton ebc1fe907d only trigger $.support.transition.end when it exists 2012-06-02 21:09:13 -07:00
Jacob Thornton 3a751a63d4 fix multi carousel bug #3194 2012-06-02 21:01:45 -07:00
Jacob Thornton 555a3b0478 fix carousel when hiding a reshowing - make sure it always triggers transition end #3248 2012-06-02 20:28:08 -07:00
Jacob Thornton 0b827965d3 fix regression in typeahead #3313 2012-06-02 19:31:30 -07:00
Jacob Thornton 354f99f0bd add length to parent dropdown check #3316 2012-06-02 19:02:30 -07:00
Jacob Thornton 4ca1cba3f8 upgrade jquery to 1.7.2 #3379 2012-06-02 18:25:07 -07:00
Jacob Thornton b07b869b26 rebuild assets 2012-06-02 18:15:23 -07:00
Jacob Thornton 806a82ef83 add relatedTarget to carousel slide event 2012-06-02 18:06:00 -07:00
Jacob Thornton f836473129 add html option back to tooltip and popover to explicitly prevent XSS #3421 2012-06-02 17:55:10 -07:00
Jacob Thornton fc96bc8bba rebuild doi 2012-06-02 17:30:00 -07:00
Jacob Thornton 5b401a8c16 add collapsed class to collapse invoker when it's target is collapsed #3525 2012-06-02 17:28:38 -07:00
Jacob Thornton 5e5965ca6f Merge branch 'accessibility' into 2.1.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-06-02 16:11:35 -07:00
Jacob Thornton ebc6935663 2.0.3 -> 2.0.4 2012-06-01 11:04:27 -07:00
Jacob Thornton 4eaeea81fd rebuild and fix test 2012-05-31 10:24:23 -07:00
Jacob Thornton 9889948f58 abandon activedescendant because it was awful 2012-05-17 00:39:14 -07:00
Jacob Thornton a7b49a7d92 nearly everything working with activedescendant... then decide it's wrong. 2012-05-17 00:23:11 -07:00
Jacob Thornton 10c6db4b14 add proper role to dialog markup and cleanup modal logging 2012-05-16 19:43:22 -07:00
Jacob Thornton a404ac33bb modal accessibility tab control 2012-05-16 19:09:57 -07:00
Jacob Thornton ffb4d9025b rebuild with typeahead change 2012-04-25 22:15:39 -07:00
Jacob Thornton a29e5a9dd6 fix #3234 2012-04-25 21:52:05 -07:00
Jacob Thornton aaabe2a46c fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild) 2012-04-24 18:06:41 -07:00
Jacob Thornton 839ef3a030 2.0.2 -> 2.0.3 2012-04-24 02:19:02 -07:00
Jacob Thornton 73453c7f79 changes for build in preperation for 2.0.3 release 2012-04-24 02:02:06 -07:00
Jacob Thornton bc07e2adae allow for pushstate in scrollspy 2012-04-18 13:35:14 -07:00
Jacob Thornton 8f98c4fbf6 offset -> position #3088 2012-04-18 13:15:13 -07:00
Jacob Thornton f3cf4cbaae rebuild 2012-04-16 17:36:03 -07:00
Jacob Thornton 6cf9906a60 build bootstrap.js and bootstrap.min.js into docs 2012-04-15 17:03:33 -07:00
Jacob Thornton 0b8042656f fixes #2941 + whitespace in collapse 2012-04-15 16:15:32 -07:00
Jacob Thornton be0efcfcfc whitespace 2012-04-14 23:38:11 -07:00
Jacob Thornton 1ca1ef94ee fix opera bug \o/ !!!! #1776 2012-04-14 23:24:19 -07:00
Jacob Thornton cf4924764c rebuild with tooltip formatting change 2012-04-14 23:11:19 -07:00
Jacob Thornton c7dc4cc573 change position of var in dropdown + cleanup makefile vars 2012-04-14 22:43:36 -07:00
Jacob Thornton 82267d48ff calling pause on a slide should actually pause it - even when hovering 2012-04-14 17:49:51 -07:00
Jacob Thornton 3408064d00 hack for subnav 2012-04-14 17:15:03 -07:00
Jacob Thornton 575f18aaf4 add jshint support + a few minor stylistic changes 2012-04-14 16:29:53 -07:00
Jacob Thornton 08fee005a8 https://github.com/twitter/bootstrap/issues/2954 2012-04-07 21:26:46 -07:00
Jacob Thornton 83febb3452 remake and add isHTML check to popover as well 2012-04-04 15:02:30 -07:00
Jacob Thornton 2dc979a202 MSTransitionEnd + move paren (thanks rick waldron) 2012-03-29 14:14:17 -07:00
Jacob Thornton 0665c3ebf7 move over paren just because. 2012-03-29 13:55:56 -07:00
Jacob Thornton 422d04cb2b simplify transition plugin a little 2012-03-29 13:51:23 -07:00