]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
14 years agoUse proper classes for three column layout 462/head
Steve Faulkner [Fri, 21 Oct 2011 19:00:39 +0000 (14:00 -0500)] 
Use proper classes for three column layout

14 years agoMerge pull request #408 from tinyfly/grid-input-size-fix
Mark Otto [Tue, 11 Oct 2011 02:44:06 +0000 (19:44 -0700)] 
Merge pull request #408 from tinyfly/grid-input-size-fix

adjust width calculations for formColumns to fix issue #404

14 years agoadjust width calculations for formColumns to fix issue #404 408/head
Jeff Adams [Mon, 10 Oct 2011 19:32:59 +0000 (14:32 -0500)] 
adjust width calculations for formColumns to fix issue #404

14 years agoMerge pull request #381 from smaboshe/docs
Mark Otto [Sat, 8 Oct 2011 06:27:19 +0000 (23:27 -0700)] 
Merge pull request #381 from smaboshe/docs

Docs

14 years ago.gitignore update. 381/head
Silumesii Maboshe [Fri, 7 Oct 2011 04:02:02 +0000 (06:02 +0200)] 
.gitignore update.

14 years agoFor consistency, updated rendered 'pre' in docs to '<pre>' in the 'Presenting code...
Silumesii Maboshe [Fri, 7 Oct 2011 03:59:34 +0000 (05:59 +0200)] 
For consistency, updated rendered 'pre' in docs to '<pre>' in the 'Presenting code' section.

14 years agoUpdated rendered '>html<' in docs to '<html>' in the 'Presenting code' section.
Silumesii Maboshe [Fri, 7 Oct 2011 03:56:45 +0000 (05:56 +0200)] 
Updated rendered '>html<' in docs to '<html>' in the 'Presenting code' section.

14 years agopass more args to placement function
Jacob Thornton [Wed, 5 Oct 2011 05:56:23 +0000 (22:56 -0700)] 
pass more args to placement function

14 years agoadd dropdown tab selection support
Jacob Thornton [Wed, 5 Oct 2011 05:11:44 +0000 (22:11 -0700)] 
add dropdown tab selection support

14 years agoremake
Jacob Thornton [Wed, 5 Oct 2011 04:26:29 +0000 (21:26 -0700)] 
remake

14 years agoMerge branch 'master' of github.com:twitter/bootstrap
Jacob Thornton [Wed, 5 Oct 2011 04:25:41 +0000 (21:25 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap

14 years agoadd selector option to alerts, update modal settings strategy
Jacob Thornton [Wed, 5 Oct 2011 04:24:59 +0000 (21:24 -0700)] 
add selector option to alerts, update modal settings strategy

14 years agoMerge pull request #346 from alepee/master
Mark Otto [Tue, 4 Oct 2011 04:32:26 +0000 (21:32 -0700)] 
Merge pull request #346 from alepee/master

Add a white-space: nowrap; for .label elements.

14 years agoMerge pull request #362 from purcell/safe-dropdown-initialization
Jacob Thornton [Mon, 3 Oct 2011 18:46:42 +0000 (11:46 -0700)] 
Merge pull request #362 from purcell/safe-dropdown-initialization

Add jquery.ready hook after defining plugin, to avoid breakage with modernizr/yepnope

14 years agoAdd jquery.ready hook after defining plugin, to avoid breakage when used with moderni... 362/head
Steve Purcell [Mon, 3 Oct 2011 09:05:43 +0000 (10:05 +0100)] 
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.

14 years agoMerge branch 'master' of github.com:twitter/bootstrap
Jacob Thornton [Mon, 3 Oct 2011 06:00:47 +0000 (23:00 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap

14 years agopreboot.less > variables.less in docs
Jacob Thornton [Mon, 3 Oct 2011 06:00:11 +0000 (23:00 -0700)] 
preboot.less > variables.less in docs

14 years agoMerge pull request #361 from samuelcarlton/patch-1
Jacob Thornton [Mon, 3 Oct 2011 05:44:33 +0000 (22:44 -0700)] 
Merge pull request #361 from samuelcarlton/patch-1

Fixed comment to show appropriate file name.

14 years agoMerge branch 'master' of github.com:twitter/bootstrap
Jacob Thornton [Mon, 3 Oct 2011 05:33:02 +0000 (22:33 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap

14 years agoremove options check in modal.js
Jacob Thornton [Mon, 3 Oct 2011 05:26:26 +0000 (22:26 -0700)] 
remove options check in modal.js

14 years agoFixed comment to show appropriate file name. 361/head
Sam Carlton [Mon, 3 Oct 2011 01:12:50 +0000 (20:12 -0500)] 
Fixed comment to show appropriate file name.

14 years agowhite-space: nowrap; for .label 346/head
Antoine Lépée [Fri, 30 Sep 2011 12:19:56 +0000 (14:19 +0200)] 
white-space: nowrap; for .label

Add white-space: nowrap; for .label elements.

14 years agoMerge pull request #329 from lmjabreu/master
Jacob Thornton [Fri, 30 Sep 2011 06:42:58 +0000 (23:42 -0700)] 
Merge pull request #329 from lmjabreu/master

make tabs plugin play well with nested tabs

14 years agowait for transition to end before triggering shown event
Jacob Thornton [Fri, 30 Sep 2011 06:38:11 +0000 (23:38 -0700)] 
wait for transition to end before triggering shown event

14 years agowhitespace
Jacob Thornton [Fri, 30 Sep 2011 06:32:10 +0000 (23:32 -0700)] 
whitespace

14 years agoMerge branch 'fix_hide_before_show_bug' of https://github.com/aaronj1335/bootstrap...
Jacob Thornton [Fri, 30 Sep 2011 06:31:26 +0000 (23:31 -0700)] 
Merge branch 'fix_hide_before_show_bug' of https://github.com/aaronj1335/bootstrap into aaronj1335-fix_hide_before_show_bug

14 years agoadd note about making sure to include boostrap-twipsy before popover script
Jacob Thornton [Fri, 30 Sep 2011 06:24:34 +0000 (23:24 -0700)] 
add note about making sure to include boostrap-twipsy before popover script

14 years agoshow should be fals for modal default
Jacob Thornton [Fri, 30 Sep 2011 06:12:27 +0000 (23:12 -0700)] 
show should be fals for modal default

14 years ago@dmyers settings fix #255
Jacob Thornton [Fri, 30 Sep 2011 06:09:53 +0000 (23:09 -0700)] 
@dmyers settings fix #255

14 years agoMerge branch 'kasperp-tab-event'
Jacob Thornton [Fri, 30 Sep 2011 06:01:06 +0000 (23:01 -0700)] 
Merge branch 'kasperp-tab-event'

14 years agochange event to use target and relatedTarget (which more closely resembles actual...
Jacob Thornton [Fri, 30 Sep 2011 06:00:10 +0000 (23:00 -0700)] 
change event to use target and relatedTarget (which more closely resembles actual event api)

14 years agochanged event should be change event
Jacob Thornton [Fri, 30 Sep 2011 05:21:55 +0000 (22:21 -0700)] 
changed event should be change event

14 years agoMerge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab...
Jacob Thornton [Fri, 30 Sep 2011 05:18:08 +0000 (22:18 -0700)] 
Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab-event

14 years agoMerge pull request #332 from pamelafox/patch-2
Jacob Thornton [Thu, 29 Sep 2011 18:28:37 +0000 (11:28 -0700)] 
Merge pull request #332 from pamelafox/patch-2

JS Docs Typo

14 years agoThink the option is supposed to be 'keyboard' in the docs, not 'closeOnEsc'. 332/head
Pamela Fox [Wed, 28 Sep 2011 21:56:54 +0000 (14:56 -0700)] 
Think the option is supposed to be 'keyboard' in the docs, not 'closeOnEsc'.

14 years agotweaked bootstrap-tabs plugin active tab selector to allow for nested tabs 329/head
Luis Abreu [Wed, 28 Sep 2011 21:08:26 +0000 (22:08 +0100)] 
tweaked bootstrap-tabs plugin active tab selector to allow for nested tabs

14 years agoreturn this 296/head
Aaron Stacy [Fri, 23 Sep 2011 21:09:18 +0000 (16:09 -0500)] 
return this

14 years agoupdated if statement form
Aaron Stacy [Fri, 23 Sep 2011 18:38:08 +0000 (13:38 -0500)] 
updated if statement form

14 years agoadded bug fix for hide-before-show bug
Aaron Stacy [Fri, 23 Sep 2011 13:46:08 +0000 (08:46 -0500)] 
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)

14 years agoadd semicolon to end of file while i think about better solution...
Jacob Thornton [Thu, 22 Sep 2011 20:13:55 +0000 (13:13 -0700)] 
add semicolon to end of file while i think about better solution...

14 years agoMerge branch 'master' of github.com:twitter/bootstrap
Jacob Thornton [Thu, 22 Sep 2011 19:55:34 +0000 (12:55 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap

14 years agoupdate table to support header and arrows
Jacob Thornton [Thu, 22 Sep 2011 19:54:57 +0000 (12:54 -0700)] 
update table to support header and arrows

14 years agoMerge pull request #278 from adamnbowen/patch-1
Jacob Thornton [Wed, 21 Sep 2011 17:59:58 +0000 (10:59 -0700)] 
Merge pull request #278 from adamnbowen/patch-1

Fixes typos of "bootstrap"

14 years agoFixes typos of "bootstrap" 278/head
Adam Bowen [Wed, 21 Sep 2011 13:38:08 +0000 (10:38 -0300)] 
Fixes typos of "bootstrap"

14 years agoMerge branch 'master' of github.com:twitter/bootstrap
Jacob Thornton [Tue, 20 Sep 2011 21:50:50 +0000 (14:50 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap

14 years agofix reflow typo - should be $element not $backdrop
Jacob Thornton [Tue, 20 Sep 2011 21:50:14 +0000 (14:50 -0700)] 
fix reflow typo - should be $element not $backdrop

14 years agoMerge pull request #268 from workwithnano/patch-1
Jacob Thornton [Tue, 20 Sep 2011 17:46:26 +0000 (10:46 -0700)] 
Merge pull request #268 from workwithnano/patch-1

Typo fix: "you're" to "your".

14 years agoTypo fix: "you're" to "your". 268/head
Nano [Tue, 20 Sep 2011 17:09:28 +0000 (14:09 -0300)] 
Typo fix: "you're" to "your".

14 years agoMerge branch 'master' of github.com:twitter/bootstrap
Jacob Thornton [Tue, 20 Sep 2011 03:14:33 +0000 (20:14 -0700)] 
Merge branch 'master' of github.com:twitter/bootstrap

14 years agoremove var O_O
Jacob Thornton [Tue, 20 Sep 2011 03:13:51 +0000 (20:13 -0700)] 
remove var O_O

14 years agoMerge pull request #259 from jacobfike/master
Jacob Thornton [Mon, 19 Sep 2011 20:07:28 +0000 (13:07 -0700)] 
Merge pull request #259 from jacobfike/master

fixes #258, clicking a tab remove .active class from all elements on the page

14 years agofixes #258, clicking a tab remove .active class from all elements on the page 259/head
Jacob Fike [Mon, 19 Sep 2011 18:54:20 +0000 (11:54 -0700)] 
fixes #258, clicking a tab remove .active class from all elements on the page

14 years agolisten to document for ie
Jacob Thornton [Mon, 19 Sep 2011 04:13:56 +0000 (21:13 -0700)] 
listen to document for ie

14 years agoforce reflow instead of relying on eventloop (firefox)
Jacob Thornton [Mon, 19 Sep 2011 04:03:52 +0000 (21:03 -0700)] 
force reflow instead of relying on eventloop (firefox)
listen to window for escape press

14 years agolemme smang it giiiirl
Jacob Thornton [Mon, 19 Sep 2011 02:05:21 +0000 (19:05 -0700)] 
lemme smang it giiiirl

14 years agoMerge pull request #241 from asmega/javascript_docs_favicon
Jacob Thornton [Sun, 18 Sep 2011 20:45:12 +0000 (13:45 -0700)] 
Merge pull request #241 from asmega/javascript_docs_favicon

fixing locations of favicon + apple icons

14 years agofixing locations of favicon + apple icons 241/head
asmega [Sun, 18 Sep 2011 14:59:52 +0000 (15:59 +0100)] 
fixing locations of favicon + apple icons

14 years agoAdded changed event to bootstrap-tabs.js 237/head
Kasper Bøgebjerg Pedersen [Sun, 18 Sep 2011 08:15:24 +0000 (10:15 +0200)] 
Added changed event to bootstrap-tabs.js

14 years agochange version in makefile to 1.3
Jacob Thornton [Sun, 18 Sep 2011 01:25:40 +0000 (18:25 -0700)] 
change version in makefile to 1.3

14 years agoMerge pull request #233 from cheeaun/patch-1
Jacob Thornton [Sun, 18 Sep 2011 01:20:56 +0000 (18:20 -0700)] 
Merge pull request #233 from cheeaun/patch-1

Documentation typo/error on scrollSpy.

14 years agoDocumentation typo/error on scrollSpy. 233/head
Lim Chee Aun [Sun, 18 Sep 2011 00:35:34 +0000 (08:35 +0800)] 
Documentation typo/error on scrollSpy.

14 years agoallow backdrop option to accept "static" option
Jacob Thornton [Sat, 17 Sep 2011 21:20:51 +0000 (14:20 -0700)] 
allow backdrop option to accept "static" option

14 years agoAdding flag to prevent backdrop click hiding modal 231/head
Nick Veys [Sat, 17 Sep 2011 19:47:38 +0000 (14:47 -0500)] 
Adding flag to prevent backdrop click hiding modal

14 years agofix fluid example
Mark Otto [Fri, 16 Sep 2011 21:07:18 +0000 (14:07 -0700)] 
fix fluid example

14 years agoFix spelling mistake in pre on js page (/ul instead of /div).
Mark Otto [Fri, 16 Sep 2011 20:01:49 +0000 (13:01 -0700)] 
Fix spelling mistake in pre on js page (/ul instead of /div).

14 years agofix readme link spacing v1.3.0
Jacob Thornton [Fri, 16 Sep 2011 19:30:30 +0000 (12:30 -0700)] 
fix readme link spacing

14 years agoremake for version 1.3
Jacob Thornton [Fri, 16 Sep 2011 18:24:45 +0000 (11:24 -0700)] 
remake for version 1.3

14 years agoMerge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Jacob Thornton [Fri, 16 Sep 2011 18:24:07 +0000 (11:24 -0700)] 
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

14 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Jacob Thornton [Fri, 16 Sep 2011 18:09:46 +0000 (11:09 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

14 years agocheck for jquery/ender on window
Jacob Thornton [Fri, 16 Sep 2011 18:09:26 +0000 (11:09 -0700)] 
check for jquery/ender on window

14 years agoupdate alert message for ie7 to adjust dismiss icon, update example pages to clean...
Mark Otto [Fri, 16 Sep 2011 17:51:44 +0000 (10:51 -0700)] 
update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing

14 years agoMerge pull request #219 from caniszczyk/1.3-wip
Mark Otto [Fri, 16 Sep 2011 17:37:52 +0000 (10:37 -0700)] 
Merge pull request #219 from caniszczyk/1.3-wip

Merge in pull request to clarify docs licensing as CC BY 3.0

14 years agoClarify documentation license to be CC BY 3.0 219/head
Chris Aniszczyk [Fri, 16 Sep 2011 17:30:22 +0000 (10:30 -0700)] 
Clarify documentation license to be CC BY 3.0

Signed-off-by: Chris Aniszczyk <zx@twitter.com>
14 years agoadd active class back to tabs
Mark Otto [Fri, 16 Sep 2011 17:15:45 +0000 (10:15 -0700)] 
add active class back to tabs

14 years agofix tabs jitter bug when there is no active class
Mark Otto [Fri, 16 Sep 2011 17:14:35 +0000 (10:14 -0700)] 
fix tabs jitter bug when there is no active class

14 years agoexpanding comment in application.js
Mark Otto [Fri, 16 Sep 2011 16:55:12 +0000 (09:55 -0700)] 
expanding comment in application.js

14 years agofixing conflict and recompiling
Mark Otto [Fri, 16 Sep 2011 16:47:36 +0000 (09:47 -0700)] 
fixing conflict and recompiling

14 years agoupdated table styles a bit and floated the fluid columns to clear the row dropping...
Mark Otto [Fri, 16 Sep 2011 16:41:58 +0000 (09:41 -0700)] 
updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having

14 years ago$(document).ready instead of $(function() {}) for ender support
Jacob Thornton [Fri, 16 Sep 2011 06:16:06 +0000 (23:16 -0700)] 
$(document).ready instead of $(function() {}) for ender support

14 years agomv 1.3.0 file names to plane bootstrap.css for submodulers
Jacob Thornton [Fri, 16 Sep 2011 06:09:56 +0000 (23:09 -0700)] 
mv 1.3.0 file names to plane bootstrap.css for submodulers

14 years agoremove table border seperate for ie
Jacob Thornton [Fri, 16 Sep 2011 05:40:50 +0000 (22:40 -0700)] 
remove table border seperate for ie

14 years agomove clearfix logic back onto clearfix class for ie7
Jacob Thornton [Fri, 16 Sep 2011 05:36:32 +0000 (22:36 -0700)] 
move clearfix logic back onto clearfix class for ie7

14 years agolittle fixes for ie 7
Jacob Thornton [Fri, 16 Sep 2011 05:27:41 +0000 (22:27 -0700)] 
little fixes for ie 7

14 years agoupdate attributes for js and make tooltips reposition on resize
Jacob Thornton [Fri, 16 Sep 2011 04:19:39 +0000 (21:19 -0700)] 
update attributes for js and make tooltips reposition on resize

14 years agoallow multi-select lists in forms
Mark Otto [Wed, 14 Sep 2011 15:58:20 +0000 (08:58 -0700)] 
allow multi-select lists in forms

14 years agoapply clearfix to appended input pattern to clear the floats
Mark Otto [Wed, 14 Sep 2011 05:23:08 +0000 (22:23 -0700)] 
apply clearfix to appended input pattern to clear the floats

14 years agoupdated browsers image
Mark Otto [Wed, 14 Sep 2011 03:24:30 +0000 (20:24 -0700)] 
updated browsers image

14 years agofix tab-content and pre funkiness, convert p in tab content to div
Mark Otto [Tue, 13 Sep 2011 21:47:18 +0000 (14:47 -0700)] 
fix tab-content and pre funkiness, convert p in tab content to div

14 years agoupdates to docs to include more example html, include links to javascript docs where...
Mark Otto [Tue, 13 Sep 2011 17:08:24 +0000 (10:08 -0700)] 
updates to docs to include more example html, include links to javascript docs where necessary

14 years agoremove theming section from docs
Mark Otto [Tue, 13 Sep 2011 16:44:43 +0000 (09:44 -0700)] 
remove theming section from docs

14 years agoadding quick and dirty favicons and touch icons for iOS
Mark Otto [Tue, 13 Sep 2011 16:35:43 +0000 (09:35 -0700)] 
adding quick and dirty favicons and touch icons for iOS

14 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Mark Otto [Tue, 13 Sep 2011 05:19:44 +0000 (22:19 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

14 years agocomment out box-shadow on masthead and footer in docs.css because Opera sucks at...
Mark Otto [Tue, 13 Sep 2011 05:19:28 +0000 (22:19 -0700)] 
comment out box-shadow on masthead and footer in docs.css because Opera sucks at inset box-shadow :"

14 years agoMerge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Jacob Thornton [Tue, 13 Sep 2011 04:06:53 +0000 (21:06 -0700)] 
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

14 years agofix docs for opera
Jacob Thornton [Tue, 13 Sep 2011 04:06:29 +0000 (21:06 -0700)] 
fix docs for opera

14 years agoremove theme.less and split preboot.less to mixins.less and variables.less to isolate...
Mark Otto [Tue, 13 Sep 2011 03:07:26 +0000 (20:07 -0700)] 
remove theme.less and split preboot.less to mixins.less and variables.less to isolate customization from function

14 years agoremove adaptive, recomment theme.less to avoid comments in compiled
Mark Otto [Tue, 13 Sep 2011 02:40:48 +0000 (19:40 -0700)] 
remove adaptive, recomment theme.less to avoid comments in compiled

14 years agoresolve conflict
Mark Otto [Tue, 13 Sep 2011 02:00:59 +0000 (19:00 -0700)] 
resolve conflict

14 years agofix topbar link with button bug
Mark Otto [Tue, 13 Sep 2011 02:00:44 +0000 (19:00 -0700)] 
fix topbar link with button bug

14 years agoLink Twitter account in readme
Mark Otto [Mon, 12 Sep 2011 21:33:39 +0000 (14:33 -0700)] 
Link Twitter account in readme