]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoMerge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip 4784/head
Ross Johnson [Tue, 28 Aug 2012 16:14:34 +0000 (11:14 -0500)] 
Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip

12 years agoFix key events with Chrome + jQuery 1.8.0 4767/head
Ross Johnson [Tue, 28 Aug 2012 05:55:56 +0000 (00:55 -0500)] 
Fix key events with Chrome + jQuery 1.8.0

12 years agoMerge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
Mark Otto [Tue, 28 Aug 2012 05:43:05 +0000 (22:43 -0700)] 
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip

12 years agofixes #4729: only use margin-top on .help-block when it follows an input, select...
Mark Otto [Tue, 28 Aug 2012 05:42:12 +0000 (22:42 -0700)] 
fixes #4729: only use margin-top on .help-block when it follows an input, select, textarea

12 years agoonly stop prop on form – as people seem to be relying on dropdown hiding when clickin...
Jacob Thornton [Tue, 28 Aug 2012 04:44:09 +0000 (21:44 -0700)] 
only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements

12 years agoMerge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
Jacob Thornton [Tue, 28 Aug 2012 04:27:31 +0000 (21:27 -0700)] 
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip

12 years agocrude check to make sure element has a # for an id
Jacob Thornton [Tue, 28 Aug 2012 04:27:01 +0000 (21:27 -0700)] 
crude check to make sure element has a # for an id

12 years agofixes #4741: undo previous version's attempt at firefox gradient changes and add...
Mark Otto [Tue, 28 Aug 2012 04:18:55 +0000 (21:18 -0700)] 
fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests

12 years agoMerge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
Mark Otto [Tue, 28 Aug 2012 04:06:29 +0000 (21:06 -0700)] 
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip

12 years agofixes #4653: add hover states to stateful table rows
Mark Otto [Tue, 28 Aug 2012 04:06:21 +0000 (21:06 -0700)] 
fixes #4653: add hover states to stateful table rows

12 years agofix for #4761
Jacob Thornton [Tue, 28 Aug 2012 03:58:51 +0000 (20:58 -0700)] 
fix for #4761

12 years agofix for open elements under modal when .modal-open
Jacob Thornton [Tue, 28 Aug 2012 03:43:12 +0000 (20:43 -0700)] 
fix for open elements under modal when .modal-open

12 years agofix docs horizontal scroll on tablet viewports
Mark Otto [Tue, 28 Aug 2012 03:32:42 +0000 (20:32 -0700)] 
fix docs horizontal scroll on tablet viewports

12 years agoMerge pull request #4765 from globocom/missing-i18n-tag-getting-started-download...
Mark Otto [Tue, 28 Aug 2012 03:06:42 +0000 (20:06 -0700)] 
Merge pull request #4765 from globocom/missing-i18n-tag-getting-started-download-page

i18n tags missing in some strings at getting started download page

12 years agoi18n tags missing in some strings at getting started download page 4765/head
Alexandre Magno [Tue, 28 Aug 2012 02:54:07 +0000 (23:54 -0300)] 
i18n tags missing in some strings at getting started download page

12 years agofixes #4664: spelling mistake in alerts docs
Mark Otto [Mon, 27 Aug 2012 22:48:54 +0000 (15:48 -0700)] 
fixes #4664: spelling mistake in alerts docs

12 years agofixes #4666: overrides for input types with .btn-block
Mark Otto [Mon, 27 Aug 2012 22:39:55 +0000 (15:39 -0700)] 
fixes #4666: overrides for input types with .btn-block

12 years agofixes #4556: add mention of disable state and required js to buttons docs
Mark Otto [Mon, 27 Aug 2012 22:27:43 +0000 (15:27 -0700)] 
fixes #4556: add mention of disable state and required js to buttons docs

12 years agofixes #4671: mention collapsing parents in docs for affix plugin
Mark Otto [Mon, 27 Aug 2012 22:20:50 +0000 (15:20 -0700)] 
fixes #4671: mention collapsing parents in docs for affix plugin

12 years agoremove min-height from .span3 in docs since we no longer need it
Mark Otto [Mon, 27 Aug 2012 22:12:55 +0000 (15:12 -0700)] 
remove min-height from .span3 in docs since we no longer need it

12 years agoadd min-height: 1px; to .span* classes to prevent grid columns from collapsing
Mark Otto [Mon, 27 Aug 2012 22:12:22 +0000 (15:12 -0700)] 
add min-height: 1px; to .span* classes to prevent grid columns from collapsing

12 years agofixes #4725: width of .uneditable-input should match standard text input width
Mark Otto [Mon, 27 Aug 2012 19:07:28 +0000 (12:07 -0700)] 
fixes #4725: width of .uneditable-input should match standard text input width

12 years agofixes #4718: add vertical-align: middle; to .btn-group to ensure proper alignment...
Mark Otto [Mon, 27 Aug 2012 19:05:15 +0000 (12:05 -0700)] 
fixes #4718: add vertical-align: middle; to .btn-group to ensure proper alignment next to standard .btn

12 years agofixes #4577: no margin on .control-row .span* in responsive
Mark Otto [Mon, 27 Aug 2012 18:46:47 +0000 (11:46 -0700)] 
fixes #4577: no margin on .control-row .span* in responsive

12 years agofixes #4644: ensure new static navbar negative indents on responsive layouts like...
Mark Otto [Mon, 27 Aug 2012 18:05:01 +0000 (11:05 -0700)] 
fixes #4644: ensure new static navbar negative indents on responsive layouts like fixed navbars

12 years agofixes #4640: pagination span issues resolved by scoping selectors to appropriate...
Mark Otto [Mon, 27 Aug 2012 17:56:46 +0000 (10:56 -0700)] 
fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links

12 years agofixes #4680: proper margin on buttons in navbar forms
Mark Otto [Mon, 27 Aug 2012 17:52:11 +0000 (10:52 -0700)] 
fixes #4680: proper margin on buttons in navbar forms

12 years agofixes #4578: add clearfix to .navbar-inner to clear floats
Mark Otto [Mon, 27 Aug 2012 17:32:07 +0000 (10:32 -0700)] 
fixes #4578: add clearfix to .navbar-inner to clear floats

12 years agofixes #4562: correct select and input widths at 220px (changed with 2.1.0 when we...
Mark Otto [Mon, 27 Aug 2012 17:08:16 +0000 (10:08 -0700)] 
fixes #4562: correct select and input widths at 220px (changed with 2.1.0 when we changed padding)

12 years agofixes #4540: adjust vertical alignment of .btn-group in .navbar
Mark Otto [Mon, 27 Aug 2012 17:04:58 +0000 (10:04 -0700)] 
fixes #4540: adjust vertical alignment of .btn-group in .navbar

12 years agofixes #4742: add default value to striped gradient
Mark Otto [Mon, 27 Aug 2012 16:53:23 +0000 (09:53 -0700)] 
fixes #4742: add default value to striped gradient

12 years agofixes #4749: correct initialism example
Mark Otto [Mon, 27 Aug 2012 16:18:32 +0000 (09:18 -0700)] 
fixes #4749: correct initialism example

12 years agofixes #4748: document jquery dependency better
Mark Otto [Mon, 27 Aug 2012 16:17:20 +0000 (09:17 -0700)] 
fixes #4748: document jquery dependency better

12 years agofixes #4512: improved borders on navbars
Mark Otto [Mon, 27 Aug 2012 06:23:47 +0000 (23:23 -0700)] 
fixes #4512: improved borders on navbars

12 years agofixes #4506: clearfix added to .dl-horizontal to account for empty dd elements
Mark Otto [Mon, 27 Aug 2012 06:06:56 +0000 (23:06 -0700)] 
fixes #4506: clearfix added to .dl-horizontal to account for empty dd elements

12 years agoMerge branch 'sparanoid-master' into 2.1.1-wip
Mark Otto [Mon, 27 Aug 2012 05:30:49 +0000 (22:30 -0700)] 
Merge branch 'sparanoid-master' into 2.1.1-wip

12 years agofixes #4734 manually: doctype in getting started in examples
Mark Otto [Mon, 27 Aug 2012 05:29:40 +0000 (22:29 -0700)] 
fixes #4734 manually: doctype in getting started in examples

12 years agofixes #4676 manually: example html updated
Mark Otto [Sun, 26 Aug 2012 05:31:10 +0000 (22:31 -0700)] 
fixes #4676 manually: example html updated

12 years agoAdd .transition-delay mixin 4716/head
Tunghsiao Liu [Sun, 26 Aug 2012 05:09:10 +0000 (13:09 +0800)] 
Add .transition-delay mixin

12 years agofixes #4672 manually: placeholder comment
Mark Otto [Sun, 26 Aug 2012 04:51:07 +0000 (21:51 -0700)] 
fixes #4672 manually: placeholder comment

12 years agoMerge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
Mark Otto [Sun, 26 Aug 2012 02:41:25 +0000 (19:41 -0700)] 
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip

12 years agoavoid top margin on input-append/prepend in .navbar-form
Mark Otto [Fri, 24 Aug 2012 21:45:02 +0000 (14:45 -0700)] 
avoid top margin on input-append/prepend in .navbar-form

12 years agofixes #4657: proper border radius property in tables
Mark Otto [Thu, 23 Aug 2012 22:04:41 +0000 (15:04 -0700)] 
fixes #4657: proper border radius property in tables

12 years agoMerge pull request #4643 from rpavlik/codespell
Mark Otto [Thu, 23 Aug 2012 16:51:20 +0000 (09:51 -0700)] 
Merge pull request #4643 from rpavlik/codespell

Spelling mistake in tooltip test

12 years agoMerge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
Mark Otto [Thu, 23 Aug 2012 16:47:44 +0000 (09:47 -0700)] 
Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning

.warning for table tr  and .info for .control-group

12 years agoFix typo found with codespell. 4642/head 4643/head
Ryan Pavlik [Thu, 23 Aug 2012 16:41:55 +0000 (11:41 -0500)] 
Fix typo found with codespell.

12 years agonuke 10px right margin on .navbar .nav
Mark Otto [Thu, 23 Aug 2012 16:38:56 +0000 (09:38 -0700)] 
nuke 10px right margin on .navbar .nav

12 years agodelete components folder
Mark Otto [Thu, 23 Aug 2012 15:30:27 +0000 (08:30 -0700)] 
delete components folder

12 years agofixes #4591 properly: remove -1px left margin on .input-append .add-on
Mark Otto [Thu, 23 Aug 2012 03:32:47 +0000 (20:32 -0700)] 
fixes #4591 properly: remove -1px left margin on .input-append .add-on

12 years agofixes #4604: add span support to .pager component
Mark Otto [Thu, 23 Aug 2012 03:28:08 +0000 (20:28 -0700)] 
fixes #4604: add span support to .pager component

12 years agofixed #4598, typo, manually
Mark Otto [Thu, 23 Aug 2012 03:23:58 +0000 (20:23 -0700)] 
fixed #4598, typo, manually

12 years agofixes #4542 manually: typo in phantomjs and space between url in markdown
Mark Otto [Wed, 22 Aug 2012 17:44:41 +0000 (10:44 -0700)] 
fixes #4542 manually: typo in phantomjs and space between url in markdown

12 years agofixes #4561: typo
Mark Otto [Wed, 22 Aug 2012 16:51:41 +0000 (09:51 -0700)] 
fixes #4561: typo

12 years agofixes #4564 manually: typo in getting started jumbotron
Mark Otto [Wed, 22 Aug 2012 16:48:57 +0000 (09:48 -0700)] 
fixes #4564 manually: typo in getting started jumbotron

12 years agofixes #4567: link in scaffolding page
Mark Otto [Wed, 22 Aug 2012 16:46:07 +0000 (09:46 -0700)] 
fixes #4567: link in scaffolding page

12 years agofixes #4586: typo in docs
Mark Otto [Wed, 22 Aug 2012 16:45:57 +0000 (09:45 -0700)] 
fixes #4586: typo in docs

12 years agoAdd info state to form validation 4560/head
Andreas Cederström [Wed, 22 Aug 2012 09:24:02 +0000 (11:24 +0200)] 
Add info state to form validation

12 years agoAdd .warning to table rows
Andreas Cederström [Wed, 22 Aug 2012 09:20:31 +0000 (11:20 +0200)] 
Add .warning to table rows

12 years agofixes #4505: lighten navbar text and link color so hover looks darker
Mark Otto [Tue, 21 Aug 2012 21:53:23 +0000 (14:53 -0700)] 
fixes #4505: lighten navbar text and link color so hover looks darker

12 years agorunning make on previous merge
Mark Otto [Tue, 21 Aug 2012 21:43:13 +0000 (14:43 -0700)] 
running make on previous merge

12 years agoMerge branch 'PavelDemyanenko-patch-1' into 2.1.1-wip
Mark Otto [Tue, 21 Aug 2012 21:42:25 +0000 (14:42 -0700)] 
Merge branch 'PavelDemyanenko-patch-1' into 2.1.1-wip

12 years agoalternate fix to #4522: increase line-height on btn-mini
Mark Otto [Tue, 21 Aug 2012 21:38:47 +0000 (14:38 -0700)] 
alternate fix to #4522: increase line-height on btn-mini

12 years agofixes #4526: box-shadow on .radio and .checkbox if .control-group has a form field...
Mark Otto [Tue, 21 Aug 2012 21:22:26 +0000 (14:22 -0700)] 
fixes #4526: box-shadow on .radio and .checkbox if .control-group has a form field state

12 years agoMerge branch 'incbee-master' into 2.1.1-wip
Mark Otto [Tue, 21 Aug 2012 21:16:09 +0000 (14:16 -0700)] 
Merge branch 'incbee-master' into 2.1.1-wip

12 years agorun make
Mark Otto [Tue, 21 Aug 2012 21:15:50 +0000 (14:15 -0700)] 
run make

12 years agofixes #4523: more specific selectors on white icon inversion
Mark Otto [Tue, 21 Aug 2012 21:15:01 +0000 (14:15 -0700)] 
fixes #4523: more specific selectors on white icon inversion

12 years agoFix all submenus expanded recursively in dropdown 4534/head
philippm [Tue, 21 Aug 2012 21:10:36 +0000 (22:10 +0100)] 
Fix all submenus expanded recursively in dropdown

The problem was that the CSS selector made *all* of a submenu's nested
menus visible. Fixed by applying the selector to the immediate nested
menu only.

12 years agofixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borde...
Mark Otto [Tue, 21 Aug 2012 21:07:20 +0000 (14:07 -0700)] 
fixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form

12 years agofixes #4530: fix docs nesting cols comments
Mark Otto [Tue, 21 Aug 2012 20:59:13 +0000 (13:59 -0700)] 
fixes #4530: fix docs nesting cols comments

12 years agoadd css tests and stuff for #4528
Mark Otto [Tue, 21 Aug 2012 20:42:00 +0000 (13:42 -0700)] 
add css tests and stuff for #4528

12 years agoupdate version numbers to 2.1.1
Mark Otto [Tue, 21 Aug 2012 20:11:25 +0000 (13:11 -0700)] 
update version numbers to 2.1.1

12 years agofixes #4520: manually fix example html for icon
Mark Otto [Tue, 21 Aug 2012 20:09:01 +0000 (13:09 -0700)] 
fixes #4520: manually fix example html for icon

12 years agofixes #4517 manually in mustache file as well, typo in docs
Mark Otto [Tue, 21 Aug 2012 20:08:09 +0000 (13:08 -0700)] 
fixes #4517 manually in mustache file as well, typo in docs

12 years agoMerge branch 'UTGuy-master' into 2.1.1-wip
Mark Otto [Tue, 21 Aug 2012 20:07:11 +0000 (13:07 -0700)] 
Merge branch 'UTGuy-master' into 2.1.1-wip

12 years agoclean up spacing and run make
Mark Otto [Tue, 21 Aug 2012 20:07:06 +0000 (13:07 -0700)] 
clean up spacing and run make

12 years agoremove entity in content property on dropup carets--not necessary at all
Mark Otto [Tue, 21 Aug 2012 20:02:02 +0000 (13:02 -0700)] 
remove entity in content property on dropup carets--not necessary at all

12 years agofixes #4493: typo in dimiss alerts docs
Mark Otto [Tue, 21 Aug 2012 20:00:40 +0000 (13:00 -0700)] 
fixes #4493: typo in dimiss alerts docs

12 years agofixes #4480: typo in scaffolding page
Mark Otto [Tue, 21 Aug 2012 19:59:26 +0000 (12:59 -0700)] 
fixes #4480: typo in scaffolding page

12 years agofixes #4473: docs example typo for js affix plugin
Mark Otto [Tue, 21 Aug 2012 19:58:48 +0000 (12:58 -0700)] 
fixes #4473: docs example typo for js affix plugin

12 years agofixes #4472: manually change mustache file as well for typo
Mark Otto [Tue, 21 Aug 2012 19:57:41 +0000 (12:57 -0700)] 
fixes #4472: manually change mustache file as well for typo

12 years agoUpdate less/variables.less 4509/head
UTGuy [Tue, 21 Aug 2012 14:21:28 +0000 (11:21 -0300)] 
Update less/variables.less

https://github.com/twitter/bootstrap/issues/4508

should fix this issue

12 years agoFix bug Collapse broken in IE 4496/head 4499/head
Pavel Demyanenko [Tue, 21 Aug 2012 10:33:15 +0000 (14:33 +0400)] 
Fix bug Collapse broken in IE

12 years agoadd affix to zip
Jacob Thornton [Tue, 21 Aug 2012 06:13:43 +0000 (23:13 -0700)] 
add affix to zip

12 years agofix afffix v2.1.0
Jacob Thornton [Mon, 20 Aug 2012 23:43:49 +0000 (16:43 -0700)] 
fix afffix

12 years agoadd bottom margin back to sidenav for narrow tablets
Mark Otto [Mon, 20 Aug 2012 23:37:46 +0000 (16:37 -0700)] 
add bottom margin back to sidenav for narrow tablets

12 years agofix jittering of sidenav
Mark Otto [Mon, 20 Aug 2012 23:33:41 +0000 (16:33 -0700)] 
fix jittering of sidenav

12 years agosmall nits
Jacob Thornton [Mon, 20 Aug 2012 23:21:57 +0000 (16:21 -0700)] 
small nits

12 years agofMerge branch '2.1.0-wip'
Jacob Thornton [Mon, 20 Aug 2012 23:13:46 +0000 (16:13 -0700)] 
fMerge branch '2.1.0-wip'

Conflicts:
docs/index.html

12 years agofixes #4178: translate3d instead of translate
Mark Otto [Mon, 20 Aug 2012 21:26:38 +0000 (14:26 -0700)] 
fixes #4178: translate3d instead of translate

12 years agoie7 button group and button toggle padding changes
Mark Otto [Mon, 20 Aug 2012 19:27:45 +0000 (12:27 -0700)] 
ie7 button group and button toggle padding changes

12 years agofix vertical button-groups in ie7
Mark Otto [Mon, 20 Aug 2012 19:20:22 +0000 (12:20 -0700)] 
fix vertical button-groups in ie7

12 years agofix ie7 dropdowns examples in docs
Mark Otto [Mon, 20 Aug 2012 19:16:15 +0000 (12:16 -0700)] 
fix ie7 dropdowns examples in docs

12 years agorun make and add comment
Mark Otto [Mon, 20 Aug 2012 18:31:24 +0000 (11:31 -0700)] 
run make and add comment

12 years agoMerge branch 'patch-1' of https://github.com/krnlde/bootstrap into krnlde-patch-1
Mark Otto [Mon, 20 Aug 2012 18:28:43 +0000 (11:28 -0700)] 
Merge branch 'patch-1' of https://github.com/krnlde/bootstrap into krnlde-patch-1

12 years agoremove relative and top positioning from docs sidenav at narrow layout
Mark Otto [Mon, 20 Aug 2012 18:28:30 +0000 (11:28 -0700)] 
remove relative and top positioning from docs sidenav at narrow layout

12 years agobump up height of progress bars, give some extra depth with stacking bars, and then...
Mark Otto [Mon, 20 Aug 2012 18:22:37 +0000 (11:22 -0700)] 
bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work

12 years agoMerge branch 'progress-multi-2.1.0-wip' of https://github.com/jpommerening/bootstrap...
Mark Otto [Mon, 20 Aug 2012 18:13:07 +0000 (11:13 -0700)] 
Merge branch 'progress-multi-2.1.0-wip' of https://github.com/jpommerening/bootstrap into jpommerening-progress-multi-2.1.0-wip

12 years agoreorder jumbotron links
Mark Otto [Mon, 20 Aug 2012 18:09:16 +0000 (11:09 -0700)] 
reorder jumbotron links

12 years agofixes #4469 manually: reset width on file inputs
Mark Otto [Mon, 20 Aug 2012 17:28:41 +0000 (10:28 -0700)] 
fixes #4469 manually: reset width on file inputs

12 years agostack mutliple progress bars 4464/head
Jonas Pommerening [Mon, 20 Aug 2012 08:12:03 +0000 (10:12 +0200)] 
stack mutliple progress bars