aboutsummaryrefslogtreecommitdiff
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2012-12-20Merge branch '2.2.3' into 3.0.0-wipMark Otto15-1156/+152
Conflicts: Makefile README.md component.json docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/assets/js/bootstrap-affix.js docs/assets/js/bootstrap-alert.js docs/assets/js/bootstrap-button.js docs/assets/js/bootstrap-carousel.js docs/assets/js/bootstrap-collapse.js docs/assets/js/bootstrap-dropdown.js docs/assets/js/bootstrap-modal.js docs/assets/js/bootstrap-popover.js docs/assets/js/bootstrap-scrollspy.js docs/assets/js/bootstrap-tab.js docs/assets/js/bootstrap-tooltip.js docs/assets/js/bootstrap-transition.js docs/assets/js/bootstrap-typeahead.js docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/index.html docs/templates/pages/base-css.mustache docs/templates/pages/index.mustache docs/templates/pages/javascript.mustache js/bootstrap-affix.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-tooltip.js js/bootstrap-transition.js js/bootstrap-typeahead.js less/bootstrap.less less/responsive.less less/type.less package.json
2012-12-19Get on that carousel indicator lifestyle with some new hawtnessMark Otto1-0/+25
2012-12-19Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3Mark Otto10-68/+110
2012-12-19lol we dont' have affix(refresh)fat5-21/+3
2012-12-19Holy shit, buttons, button states, and input states updatedMark Otto3-58/+94
2012-12-19add js support for carousel indicatorsfat6-17/+53
2012-12-19Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into ↵Mark Otto3-5/+89
cvrebert-3.0.0-wip Conflicts: docs/assets/css/bootstrap.css less/mixins.less
2012-12-19Unfuck the fucked gradient with it's fucked mix() of background colors; nuke ↵Mark Otto1-45/+24
commented out code
2012-12-19More button tweaksMark Otto1-27/+143
2012-12-19wait 100ms before engaging affix (allows for initial browser scroll)fat1-6/+8
2012-12-19remove commented out buttons css, update docsMark Otto3-71/+11
2012-12-19whitespace in tooltip + don't pass empty selector to $() in dropdown.jsfat4-7/+7
2012-12-19overhaul buttonsMark Otto3-280/+99
2012-12-19Unfuck the fucked homepageMark Otto2-2/+2
2012-12-19fix tooltip doc dumbnessfat1-1/+1
2012-12-19can't extend bounding box thingyfat3-3/+5
2012-12-19Remove @black and just use #000Mark Otto1-5/+5
2012-12-19fix ghetto ass timeout shitfat3-5/+29
2012-12-19Change .jumbotron usage in docs layout to .bs-docs-jumbotronMark Otto17-21/+21
2012-12-19Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports ↵Mark Otto3-9/+9
metaphors are cooler than ad ones
2012-12-19remove inside support from tooltip + fix tooltip svg support + change ↵fat3-21/+17
makefile to rely on local npm install
2012-12-19Drop labels from the docsMark Otto4-154/+20
2012-12-19Drop .label component. Instead, just use .badge because fuck dupe code and ↵Mark Otto1-24/+0
stuff.
2012-12-19Drop .form-search supportMark Otto2-76/+2
2012-12-19Merge branch 'bs3-input-groups' into 3.0.0-wipMark Otto3-553/+254
Conflicts: docs/assets/css/bootstrap.css
2012-12-19no need for margin-top on .typeahead, it's set on .dropdown-menuMark Otto1-1/+0
2012-12-19Remove support for multiple buttons in input groups because fuck that shit.Mark Otto3-72/+6
2012-12-19Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate ↵Mark Otto1-2/+2
children only
2012-12-19Use normalize as separate file instead of with other resets; still need to ↵Mark Otto1-78/+289
punt other styles
2012-12-19Update clearfix mixin and class per @necolas's feedbackMark Otto1-33/+18
2012-12-12* modify scrollspy documentation to clarify javascript usageJim Webb1-2/+8
* add scrollspy 'target' option
2012-12-10Version bumpMark Otto19-32/+32
2012-12-10Fixes #6174: Caret alignment in small and mini buttonsMark Otto1-2/+5
2012-12-10Escape HTML of section elementMark Otto2-2/+2
2012-12-10IE10 fix in responsive utilities, not regular utilitiesMark Otto2-4/+4
2012-12-10Move IE10 responsive fix to responsive utilities so Customizer gets itMark Otto2-4/+4
2012-12-10move reset after vars and mixinsMark Otto1-32/+32
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-09fixes #5605: style as disabled all form controls & btns under a disabled ↵Chris Rebert1-14/+31
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 Embrey1-8/+8
Fixes #6197
2012-12-09Fix checkbox and radios exampleMark Otto3-48/+73
2012-12-09Nested columns docs tweaksMark Otto2-12/+12
2012-12-09Refactor input groupsMark Otto3-543/+310
* 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-08Merge conflictsMark Otto2-2/+2
2012-12-08Restore print stylesMark Otto1-0/+52
2012-12-08Test removal of print styles for customized buildsMark Otto1-52/+0
2012-12-08Fix docs typosMark Otto2-2/+2
2012-12-08Merge branch 'master' into 3.0.0-wipMark Otto19-65/+358
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