rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-03 15:24:19 +01:00
Code Issues Actions Packages Releases Activity
562 Commits 108 Branches 89 Tags 547 MiB
7a153ac817
Commit Graph

562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jacob Thornton
01ab4caa5b Merge branch 'master' of github.com:twitter/bootstrap 2011-09-19 20:14:33 -07:00
Jacob Thornton
0c6a2acd7e remove var O_O 2011-09-19 20:13:51 -07:00
Jacob Thornton
75cbf0d251 Merge pull request #259 from jacobfike/master 
fixes #258, clicking a tab remove .active class from all elements on the page
 2011-09-19 13:07:28 -07:00
Jacob Fike
9b61f71835 fixes #258, clicking a tab remove .active class from all elements on the page 2011-09-19 11:54:20 -07:00
Jacob Thornton
fc6effae51 listen to document for ie 2011-09-18 21:13:56 -07:00
Jacob Thornton
ac8001190a force reflow instead of relying on eventloop (firefox) 
listen to window for escape press
 2011-09-18 21:03:52 -07:00
Jacob Thornton
ba6f4f03da lemme smang it giiiirl 2011-09-18 19:05:21 -07:00
Jacob Thornton
89c5eb4491 Merge pull request #241 from asmega/javascript_docs_favicon 
fixing locations of favicon + apple icons
 2011-09-18 13:45:12 -07:00
asmega
159ccc9de3 fixing locations of favicon + apple icons 2011-09-18 16:10:36 +01:00
Kasper Bøgebjerg Pedersen
e16de59260 Added changed event to bootstrap-tabs.js 2011-09-18 10:15:24 +02:00
Jacob Thornton
3eafbe5c89 change version in makefile to 1.3 2011-09-17 18:25:40 -07:00
Jacob Thornton
39a16811eb Merge pull request #233 from cheeaun/patch-1 
Documentation typo/error on scrollSpy.
 2011-09-17 18:20:56 -07:00
Lim Chee Aun
7da0e5cc0c Documentation typo/error on scrollSpy. 2011-09-18 08:35:34 +08:00
Jacob Thornton
7b614cfa01 allow backdrop option to accept "static" option 2011-09-17 14:20:51 -07:00
Nick Veys
2cb233319d Adding flag to prevent backdrop click hiding modal 2011-09-17 15:08:16 -05:00
Mark Otto
732ff9ed1c fix fluid example 2011-09-16 14:07:18 -07:00
Mark Otto
08d017592b Fix spelling mistake in pre on js page (/ul instead of /div). 2011-09-16 13:01:49 -07:00
Jacob Thornton
f03f7da08b fix readme link spacing 2011-09-16 12:30:30 -07:00
Jacob Thornton
cd556cfacd remake for version 1.3 2011-09-16 11:24:45 -07:00
Jacob Thornton
c7c5ce8dcd Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip 
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
 2011-09-16 11:24:07 -07:00
Jacob Thornton
aa43239088 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-16 11:09:46 -07:00
Jacob Thornton
f0d5caf054 check for jquery/ender on window 2011-09-16 11:09:26 -07:00
Mark Otto
e8d9eb264c update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing 2011-09-16 10:51:44 -07:00
Mark Otto
29033316e4 Merge pull request #219 from caniszczyk/1.3-wip 
Merge in pull request to clarify docs licensing as CC BY 3.0
 2011-09-16 10:37:52 -07:00
Chris Aniszczyk
08b6c47ad7 Clarify documentation license to be CC BY 3.0 
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
 2011-09-16 10:30:47 -07:00
Mark Otto
597590c15d add active class back to tabs 2011-09-16 10:15:45 -07:00
Mark Otto
e663cfb43f fix tabs jitter bug when there is no active class 2011-09-16 10:14:35 -07:00
Mark Otto
c579e4d550 expanding comment in application.js 2011-09-16 09:55:12 -07:00