Chris Aniszczyk
9f0b79da7e
Update LICENSE
2011-10-28 08:57:09 -07:00
Jacob Thornton
0810b7bcf4
Merge pull request #462 from southpolesteve/master
...
Use proper span classes for three column layout in hero example
2011-10-22 11:23:48 -07:00
Steve Faulkner
7002a01978
Use proper classes for three column layout
2011-10-21 14:00:39 -05:00
Mark Otto
70b1a6b562
Merge pull request #408 from tinyfly/grid-input-size-fix
...
adjust width calculations for formColumns to fix issue #404
2011-10-10 19:44:06 -07:00
Jeff Adams
12cb0822e8
adjust width calculations for formColumns to fix issue #404
2011-10-10 14:32:59 -05:00
Mark Otto
c85e93cd90
Merge pull request #381 from smaboshe/docs
...
Docs
2011-10-07 23:27:19 -07:00
Silumesii Maboshe
df773debab
.gitignore update.
2011-10-07 06:02:02 +02:00
Silumesii Maboshe
b7d4be584a
For consistency, updated rendered 'pre' in docs to '<pre>' in the 'Presenting code' section.
2011-10-07 05:59:34 +02:00
Silumesii Maboshe
527521b502
Updated rendered '>html<' in docs to '<html>' in the 'Presenting code' section.
2011-10-07 05:56:45 +02:00
Jacob Thornton
356227ef50
pass more args to placement function
2011-10-04 22:56:23 -07:00
Jacob Thornton
a2c263493a
add dropdown tab selection support
2011-10-04 22:11:44 -07:00
Jacob Thornton
100954eeda
remake
2011-10-04 21:26:29 -07:00
Jacob Thornton
607795e37a
Merge branch 'master' of github.com:twitter/bootstrap
2011-10-04 21:25:41 -07:00
Jacob Thornton
d7e3bf722d
add selector option to alerts, update modal settings strategy
2011-10-04 21:24:59 -07:00
Mark Otto
2edf16c034
Merge pull request #346 from alepee/master
...
Add a white-space: nowrap; for .label elements.
2011-10-03 21:32:26 -07:00
Jacob Thornton
b41175f030
Merge pull request #362 from purcell/safe-dropdown-initialization
...
Add jquery.ready hook after defining plugin, to avoid breakage with modernizr/yepnope
2011-10-03 11:46:42 -07:00
Steve Purcell
bdbb1c92aa
Add jquery.ready hook after defining plugin, to avoid breakage when used with modernizr/yepnope
...
See https://gist.github.com/1258742 for an example, which results in the error
"TypeError: Object has no method 'dropdown' at bootstrap-dropdown.js line 31"
It looks like in these circumstances, the functions hooked into
jquery.ready get run immediately, and so applying the dropdown
behavior to specific elements before defining the 'dropdown' method
causes breakage.
2011-10-03 10:05:43 +01:00
Jacob Thornton
7e01ff8a15
Merge branch 'master' of github.com:twitter/bootstrap
2011-10-02 23:00:47 -07:00
Jacob Thornton
823b063c56
preboot.less > variables.less in docs
2011-10-02 23:00:11 -07:00
Jacob Thornton
5f52c5cfc3
Merge pull request #361 from samuelcarlton/patch-1
...
Fixed comment to show appropriate file name.
2011-10-02 22:44:33 -07:00
Jacob Thornton
0b625d0cb5
Merge branch 'master' of github.com:twitter/bootstrap
2011-10-02 22:33:02 -07:00
Jacob Thornton
f8be7a8052
remove options check in modal.js
2011-10-02 22:26:26 -07:00
Sam Carlton
6fb0eb8833
Fixed comment to show appropriate file name.
2011-10-02 20:12:50 -05:00
Antoine Lépée
a61a624e1d
white-space: nowrap; for .label
...
Add white-space: nowrap; for .label elements.
2011-09-30 14:19:56 +02:00
Jacob Thornton
fda10a609c
Merge pull request #329 from lmjabreu/master
...
make tabs plugin play well with nested tabs
2011-09-29 23:42:58 -07:00
Jacob Thornton
b2b8a78971
wait for transition to end before triggering shown event
2011-09-29 23:38:11 -07:00
Jacob Thornton
2715a1e09e
whitespace
2011-09-29 23:32:10 -07:00
Jacob Thornton
7a153ac817
Merge branch 'fix_hide_before_show_bug' of https://github.com/aaronj1335/bootstrap into aaronj1335-fix_hide_before_show_bug
2011-09-29 23:31:26 -07:00
Jacob Thornton
a0c3250b97
add note about making sure to include boostrap-twipsy before popover script
2011-09-29 23:24:34 -07:00
Jacob Thornton
fb749eee5e
show should be fals for modal default
2011-09-29 23:12:27 -07:00
Jacob Thornton
87d9343a30
@dmyers settings fix #255
2011-09-29 23:09:53 -07:00
Jacob Thornton
d2de00f1df
Merge branch 'kasperp-tab-event'
2011-09-29 23:01:06 -07:00
Jacob Thornton
a0bf8b67ff
change event to use target and relatedTarget (which more closely resembles actual event api)
2011-09-29 23:00:10 -07:00
Jacob Thornton
b827303511
changed event should be change event
2011-09-29 22:21:55 -07:00
Jacob Thornton
24b05fe94a
Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab-event
2011-09-29 22:18:08 -07:00
Jacob Thornton
28c770bf67
Merge pull request #332 from pamelafox/patch-2
...
JS Docs Typo
2011-09-29 11:28:37 -07:00
Pamela Fox
1be7e09b97
Think the option is supposed to be 'keyboard' in the docs, not 'closeOnEsc'.
2011-09-28 14:56:54 -07:00
Luis Abreu
9a2440aafa
tweaked bootstrap-tabs plugin active tab selector to allow for nested tabs
2011-09-28 22:08:26 +01:00
Aaron Stacy
616f136371
return this
2011-09-23 16:09:18 -05:00
Aaron Stacy
1066ec4a79
updated if statement form
2011-09-23 13:38:08 -05:00
Aaron Stacy
d541eceb51
added bug fix for hide-before-show bug
...
this commit fixes a bug where .modal('hide') is called on a modal object before
.modal('show'). this can be viewed here:
http://jsfiddle.net/aaronj1335/7hH89/8/
(notice the JS exception that is thrown)
2011-09-23 08:46:08 -05:00
Jacob Thornton
68605bdd51
add semicolon to end of file while i think about better solution...
2011-09-22 13:13:55 -07:00
Jacob Thornton
46958b2b67
Merge branch 'master' of github.com:twitter/bootstrap
2011-09-22 12:55:34 -07:00
Jacob Thornton
41983bbe67
update table to support header and arrows
2011-09-22 12:54:57 -07:00
Jacob Thornton
323de40e80
Merge pull request #278 from adamnbowen/patch-1
...
Fixes typos of "bootstrap"
2011-09-21 10:59:58 -07:00
Adam Bowen
7c637bc51c
Fixes typos of "bootstrap"
2011-09-21 10:38:08 -03:00
Jacob Thornton
6ec1abc53c
Merge branch 'master' of github.com:twitter/bootstrap
2011-09-20 14:50:50 -07:00
Jacob Thornton
f2e15402c8
fix reflow typo - should be $element not $backdrop
2011-09-20 14:50:14 -07:00
Jacob Thornton
a7134dbf43
Merge pull request #268 from workwithnano/patch-1
...
Typo fix: "you're" to "your".
2011-09-20 10:46:26 -07:00
Nano
bc6e4b8ed2
Typo fix: "you're" to "your".
2011-09-20 14:09:28 -03:00
