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
Ingmar Steen (Voipro)
6b7027eaec
Check if target is dismiss or trigged in fileupload data-api click handler.
2012-11-16 10:34:55 +01:00
Arnold Daniels
2c5abe3cbb
Added bootstrap.js in source
2012-11-16 10:34:55 +01:00
Arnold Daniels
d7979d33d2
Don't put jasny less file in subdir
2012-11-16 10:34:55 +01: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
b5af762ef5
Merge branch '2.1.2-wip'
...
Conflicts:
js/bootstrap-dropdown.js
2012-10-29 22:01:58 -07:00
fat
68cfedb34a
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-29 21:55:07 -07:00
fat
f1136228a7
add note about js style
2012-10-29 21:54:51 -07:00
Mark Otto
bf10a43ed9
derp, add that in the right spot
2012-10-29 21:34:10 -07:00
Mark Otto
5bb6c42405
fixes #4511 : remove focus on opened modal window
2012-10-29 21:33:20 -07:00
Mark Otto
a6968c4934
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-29 21:30:45 -07:00
Mark Otto
9352fe1750
add a ton of the new vars to the customizer
2012-10-29 21:30:39 -07:00
fat
f595e146d6
http link
2012-10-29 21:29:05 -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
81c3c1c68c
add media.less to customizer page
2012-10-29 21:02:05 -07:00
Mark Otto
41ad16fe40
v2.2.0 instead of v2.1.2
2012-10-29 21:00:53 -07:00
Arnold Daniels
34648bb0bd
Added typeahead functionality
...
* AJAX search
* Convert select to typeahead
* Use value objects as search
* Customizable dropdown
* Min-width menu typeahead
* Fixed click typeahead menu (see twitter/bootstrap#2715 ) as suggested by @mckramer
Padding 2px for select
2012-10-28 02:46:52 +02:00
Arnold Daniels
4dfd29aeac
Changed name of project in package.json back to bootstrap
2012-10-19 20:24:08 +02:00
Mark Otto
c33169a6ba
fixes #5572 : document .input-block-level
2012-10-18 11:19:16 -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
billy gates
7426ced0fb
Merge pull request #5323 from artiz/master
...
Please check my fix for #4550
2012-10-17 22:50:52 -07:00
billy gates
24b5e6cb14
Merge pull request #5366 from Sinetheta/2.1.2-wip
...
Fix for #5362
2012-10-17 22:30:40 -07:00
Jacob Thornton
a2fc01444e
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-17 22:27:00 -07:00
Jacob Thornton
edc3eee5ea
fix carousel event
2012-10-17 22:26:44 -07:00
billy gates
21f29a7682
Merge pull request #5389 from frntz/2.1.2-wip
...
Update js/bootstrap-tooltip.js
2012-10-17 22:15:48 -07:00
Jacob Thornton
8e6697f2b2
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-17 21:38:01 -07:00
Jacob Thornton
ac6625de5f
add updater function and rebuild
2012-10-17 21:37:34 -07:00
billy gates
0a3e034891
Merge pull request #5524 from martinstein/fix-tooltip-delegate-click
...
Fix tooltip not working in delegate events on click-trigger
2012-10-17 21:34:01 -07:00
billy gates
97bf02d787
Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fix
...
Fixed copy/paste caused typo
2012-10-17 21:25:21 -07:00
billy gates
3074737d90
Merge pull request #5549 from mfansler/2.1.2-wip
...
fixes #5336 : reorder focus() call to avoid scrolling
2012-10-17 21:21:31 -07:00
Mark Otto
e0a007b929
Merge pull request #5507 from bradly/2.1.2-wip
...
Fixing typo in docs.
2012-10-16 20:36:26 -07:00
Mark Otto
b06724a1a4
Merge pull request #5508 from bradly/fix-readme-link
...
Updating README link about Less compilation.
2012-10-16 20:36:12 -07:00
Mark Otto
709870aa3e
fixes #5496 : use correct var for dropdown active link text
2012-10-16 20:34:42 -07:00
Mark Otto
57eb2a8018
more hellip on modals
2012-10-16 20:28:07 -07:00
Mark Otto
0ac50d28b5
fixes #5519 : hellip in modal code
2012-10-16 20:18:50 -07:00
Mark Otto
78f7ad95f4
fixes #5542 : move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component.
2012-10-16 19:56:34 -07:00
Mark Otto
bf78333531
add in latest carousel example, reorg examples on getting started
2012-10-16 12:50:10 -05:00
Mark Otto
463eae25b0
clarify js docs individual or compiled section
2012-10-16 12:37:36 -05:00
mfansler
e24b46b7f3
fixes #5336 : reorder focus() call to avoid scrolling
2012-10-16 12:27:43 -04:00
Arnold Daniels
cf5ac2d729
Fixed docs: bordered tabbable
2012-10-16 15:02:12 +02:00
Arnold Daniels
741b613a86
Fixed docs: incorrect menu position rowlink
2012-10-16 14:44:38 +02:00
Dmitriy Budnik
ae0ba0686e
set spesific assertions count for test
2012-10-16 11:16:38 +03:00
Dmitriy Budnik
cd55963930
fixed test
2012-10-16 09:49:26 +03:00
