aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-12-20Merge branch '2.2.3' into 2.3.0-wipfat1-1/+1
2012-12-20if carousel element already open, don't reopen it duh bruh bruhfat1-1/+1
2012-12-20Fixes #6236: Fix popover font-size in input groupsMark Otto2-2/+5
2012-12-20Remove dropdown submenu docsMark Otto2-168/+0
2012-12-20Remove dropdown submenu CSSMark Otto2-114/+2
2012-12-20Nuke third lines form carousel examplesMark Otto2-6/+6
2012-12-20Merge branch '2.2.3' into 3.0.0-wipMark Otto1-1/+1
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-20Merge branch '2.2.3' into 3.0.0-wipMark Otto28-1197/+249
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 Otto3-2/+52
2012-12-19Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3Mark Otto17-101/+166
2012-12-19lol we dont' have affix(refresh)fat5-21/+3
2012-12-19Holy shit, buttons, button states, and input states updatedMark Otto7-67/+107
2012-12-19add js support for carousel indicatorsfat8-25/+73
2012-12-19Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into ↵Mark Otto6-24/+118
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 Otto3-70/+26
commented out code
2012-12-19More button tweaksMark Otto5-56/+200
2012-12-19wait 100ms before engaging affix (allows for initial browser scroll)fat1-6/+8
2012-12-19remove commented out buttons css, update docsMark Otto4-140/+16
2012-12-19whitespace in tooltip + don't pass empty selector to $() in dropdown.jsfat5-9/+10
2012-12-19overhaul buttonsMark Otto7-337/+163
2012-12-19Unfuck the fucked homepageMark Otto2-2/+2
2012-12-19fix tooltip doc dumbnessfat1-1/+1
2012-12-19can't extend bounding box thingyfat4-4/+6
2012-12-19Remove @black and just use #000Mark Otto5-11/+10
2012-12-19fix ghetto ass timeout shitfat4-7/+43
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 Otto6-19/+19
metaphors are cooler than ad ones
2012-12-19remove inside support from tooltip + fix tooltip svg support + change ↵fat6-42/+36
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 Otto3-44/+4
stuff.
2012-12-19Drop .form-search supportMark Otto2-76/+2
2012-12-19Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wipMark Otto1-1/+0
2012-12-19Merge branch 'bs3-input-groups' into 3.0.0-wipMark Otto7-797/+337
Conflicts: docs/assets/css/bootstrap.css
2012-12-19no need for margin-top on .typeahead, it's set on .dropdown-menuMark Otto2-2/+0
2012-12-19Remove support for multiple buttons in input groups because fuck that shit.Mark Otto4-76/+10
2012-12-19Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate ↵Mark Otto2-4/+4
children only
2012-12-19Use normalize as separate file instead of with other resets; still need to ↵Mark Otto3-82/+667
punt other styles
2012-12-19Update clearfix mixin and class per @necolas's feedbackMark Otto3-51/+34
2012-12-17Use @border-radius-base var for nav tabsMark Otto1-1/+1
2012-12-15Merge pull request #6267 from valorin/composer-fixMark Otto1-1/+0
Removing "target-dir" option to stop extra nesting
2012-12-14Removing "target-dir" option to stop extra nestingStephen Rees-Carter1-1/+0
There is no valid reason to set this since it causes extra nesting: ./vendor/twitter/bootstrap/twitter/bootstrap/
2012-12-12* modify scrollspy documentation to clarify javascript usageJim Webb1-2/+8
* add scrollspy 'target' option
2012-12-10Version bumpMark Otto38-51/+51
2012-12-10Fixes #6174: Caret alignment in small and mini buttonsMark Otto2-4/+9
2012-12-10Escape HTML of section elementMark Otto2-2/+2
2012-12-10IE10 fix in responsive utilities, not regular utilitiesMark Otto4-11/+11
2012-12-10Simplify syntax of nesting with inline listsMark Otto1-1/+1
2012-12-10Move IE10 responsive fix to responsive utilities so Customizer gets itMark Otto4-13/+11
2012-12-10squash new lineMark Otto1-1/+0
2012-12-10move reset after vars and mixinsMark Otto2-35/+35