aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-12-10document caveat regarding fieldset legend and #6199Chris Rebert2-2/+4
2012-12-10document fieldset[disabled] styling added in #6199; per @mdoChris Rebert2-0/+74
2012-12-10Merge pull request #6195 from nathanb/example-carousel-nav-fixMark Otto1-1/+1
lowered carousel beneath the nav (in carousel example)
2012-12-09fixes #5605: style as disabled all form controls & btns under a disabled ↵Chris Rebert4-33/+60
fieldset this is a resubmission of #5875, but now against branch 3.0.0-wip does not exclude elements under a fieldset's legend issue #6058 is a duplicate of #5605
2012-12-10Update .dropdown-menu selectors to avoid conflicts with other elements. ↵Blake Embrey2-16/+16
Fixes #6197
2012-12-09Fix checkbox and radios exampleMark Otto4-48/+74
2012-12-09Nested columns docs tweaksMark Otto2-12/+12
2012-12-09Refactor input groupsMark Otto6-786/+393
* Deprecate .input-append and .input-prepend * Use new, single base class for component, .input-group * Deprecate .addon for .input-group-addon * For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns * Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09lowered carousel beneath the navNathan Bridgewater1-1/+1
2012-12-09lowered carousel beneath the navNathan Bridgewater1-1/+1
2012-12-08Merge conflictsMark Otto2-2/+2
2012-12-08Restore print stylesMark Otto2-0/+122
2012-12-08Test removal of print styles for customized buildsMark Otto2-122/+0
2012-12-08Fix docs typosMark Otto2-2/+2
2012-12-08Merge branch 'master' into 3.0.0-wipMark Otto47-112/+693
Conflicts: docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/css.html docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache docs/templates/pages/javascript.mustache less/breadcrumbs.less less/tables.less less/tests/css-tests.html
2012-12-08Fixes #5729: Nested striped tablesv2.2.2Mark Otto2-4/+13
* Scopes striping to immediate children of the tbody and tr * For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
2012-12-08Nesting tablesMark Otto4-38/+70
* Add simple test to css-tests.html * Scope .table-bordered to immediate children th/td elements only
2012-12-08Merge pull request #6165 from Quy/2.2.2-wipMark Otto2-8/+8
Apply code tag to data attribute on javascript page
2012-12-08Apply code tag to data attribute on javascript pageQuy Ton2-8/+8
2012-12-07get tests passing for typeahead :Pfat5-28/+43
2012-12-07insert menu of typeahead after input which it suggests on #3529fat4-7/+7
note: this will likely break things for people in the same way that doing this to tooltip did… however we think this is a better insertion model for z-index,scrolling,modal,etc. applications
2012-12-07focus on escape in typeaheadfat5-6/+9
2012-12-07Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wipfat2-2/+19
2012-12-07remove slide from carousel constructor #5579fat4-4/+1
2012-12-07Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-navbilly gates2-2/+19
Fix issue with double move event firing in typeahead.
2012-12-07rebuild and only select visible dropdown itemsfat5-6/+6
2012-12-07Merge pull request #6118 from godric7/masterbilly gates1-1/+1
scrollSpy - add parent scrollTop to offset calculation
2012-12-07add noConflict functionality to all bootstrap pluginsfat40-22/+519
2012-12-07Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wipMark Otto2-0/+4
2012-12-07Fixes #6148: Icons in mini buttons properly alignedMark Otto4-20/+19
2012-12-07Merge pull request #6151 from tierra/pre-code-white-space-fixMark Otto2-0/+4
Fix code block white-space breaks within pre tags.
2012-12-07Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wipMark Otto4-10/+10
2012-12-07Fixes #6136: Proper scoping of breadcrumbs dividerMark Otto2-5/+5
2012-12-07Merge pull request #6143 from Quy/2.2.2-wipMark Otto4-10/+10
Escape ×
2012-12-06Fix code block white-space breaks within pre tags.Bryan Petty2-0/+4
2012-12-05Escape ×Quy Ton4-10/+10
2012-12-05Nuke all i18n tags from .mustache templatesMark Otto8-1824/+1824
2012-12-05Remove commented out old popover CSSMark Otto2-118/+0
2012-12-05Merge branch '2.2.2-wip' into 3.0.0-wipMark Otto7-68/+78
Conflicts: README.md docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/examples/fluid.html docs/scaffolding.html less/breadcrumbs.less less/popovers.less less/responsive.less
2012-12-05Merge branch '2.2.2-wip' into 3.0.0-wipMark Otto39-355/+280
Conflicts: README.md docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/examples/fluid.html docs/scaffolding.html less/breadcrumbs.less less/popovers.less less/responsive.less
2012-12-04add gallery page, fill with a few screenshots to startMark Otto22-18/+296
2012-12-04Fixes #4550: Temporary fix for dropdown taps on mobileMark Otto4-1/+4
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781 * Stops propagation for touchstart for dropdowns
2012-12-04Fix up display of dropdown submenu examples on responsive viewsMark Otto3-13/+47
2012-12-04correct link on index page to grid systemMark Otto2-2/+2
2012-12-04Update js/bootstrap-scrollspy.jsGodric1-1/+1
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation" https://github.com/twitter/bootstrap/issues/6013
2012-12-03Once more, update all the favicons to retinaMark Otto8-24/+24
2012-12-03Once more, update all the favicons to retinaMark Otto23-51/+51
2012-12-03Align the touch icons attributesMark Otto9-18/+18
2012-12-03Fixes #6115: scope breadcrumb styles to immediate children onlyMark Otto2-6/+6
2012-12-03Improve rendering of carousel example for IE10Mark Otto1-47/+57