github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-01-24 05:37:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,433 Commits 13 Branches 16 Tags
v2.2.2-p3
Commit Graph

249 Commits

Author SHA1 Message Date
Arnold Daniels
65f8a89ebe Build 2.2.2-j4 2013-01-27 23:05:40 -08:00
Arnold Daniels
9565f1703a Improved docs for v2.2.2-j3 2012-12-28 22:56:15 +01:00
Arnold Daniels
830a7f8f56 Fix customize match:js 2012-12-26 10:58:12 +01:00
Arnold Daniels
ef7599fd94 Fixed comments in bootstrap-fileupload.js 2012-12-26 10:44:48 +01:00
Arnold Daniels
76c8338f48 Fixed customize 
Rebuild docs
 2012-12-26 06:31:11 +01:00
Arnold Daniels
8fa7b7ee99 Reset fileupload on form reset. Fixed #31 
Allow resetting and clearing fileupload using js
 2012-12-25 06:41:17 +01:00
Arnold Daniels
0657ace43c Fix problem with tr comparison in jasny rowlink. Fixed #34 2012-12-25 05:43:40 +01:00
Arnold Daniels
8727176325 Fix Submit issues link in site footer. Fixes #36 2012-12-25 05:40:15 +01:00
Arnold Daniels
a78e874844 Fixed typeahead issues 
Added typeahead tests
Added new features of typeahead to docs
 2012-12-25 04:46:34 +01:00
Arnold Daniels
f997a9ada7 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3 
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/docs.css
	docs/assets/img/bs-docs-bootstrap-features.png
	docs/assets/img/bs-docs-responsive-illustrations.png
	docs/assets/img/bs-docs-twitter-github.png
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	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/customize.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
 2012-12-10 00:22:22 +01:00
Mark Otto
cacc213762 Nesting tables 
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
 2012-12-08 12:52:19 -08:00
fat
820a3b27b6 get tests passing for typeahead :P 2012-12-07 19:16:48 -05:00
fat
1747caf19d insert menu of typeahead after input which it suggests on #3529 
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
 2012-12-07 18:59:13 -05:00
fat
437654030a focus on escape in typeahead 2012-12-07 18:37:32 -05:00
fat
91fbadad5b remove slide from carousel constructor #5579 2012-12-07 17:49:05 -05:00
fat
66b70016d0 rebuild and only select visible dropdown items 2012-12-07 17:14:49 -05:00
fat
a7eb9c294a add noConflict functionality to all bootstrap plugins 2012-12-07 17:06:01 -05: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
Mark Otto
ed74992853 Fixes #4550: Temporary fix for dropdown taps on mobile 
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
 2012-12-04 18:36:18 -08:00
Andreas Cederström
68cbba347b Fixing header color for success, error and info alerts 2012-12-03 14:20:14 +01:00
Mark Otto
32d425967a run make on js changes to popover 2012-12-02 01:32:23 -08:00
Mark Otto
38c546c785 upgrade to holder 1.6 2012-11-29 21:35:45 -08:00
Mark Otto
acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08: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
Mark Otto
05655ff4ff fixes #5922: clicking only button should download custom build 2012-11-15 09:14:54 -08:00
Mark Otto
79b7017227 version bump 2012-11-05 09:32:48 -08:00
Bradly Feeley
46b5e0cbc6 Fixing various spelling typos in the docs. 2012-11-02 16:34:21 -06:00
fat
3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
fat
404e4d9e9a fix carousel and rebuild js 2012-10-30 21:32:15 -07:00
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
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
f0691a6abc Build bootstrap 2.1.1-j2 2012-10-12 05:14:13 +02:00
Arnold Daniels
372382dd22 Modified customization to work with Jasny extensions 2012-10-11 19:46:49 +02:00
Arnold Daniels
6cb9e62662 Bump to version 2.1.1-j2 2012-10-11 02:57:18 +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
Arnold Daniels
9e82eba470 Build 2.1.0-j2-wip 2012-09-27 15:19:58 +02: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