aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-02-05nuke rogue conflict comment and remakeMark Otto2-1/+4705
2013-02-05Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto1-1/+1
Conflicts: docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/examples/hero.html less/buttons.less less/carousel.less less/close.less less/dropdowns.less less/labels-badges.less less/mixins.less less/navbar.less less/navs.less less/pagination.less less/responsive-navbar.less less/scaffolding.less less/sprites.less less/thumbnails.less less/type.less
2013-02-05Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto16-4724/+61
Conflicts: docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css docs/examples/hero.html less/buttons.less less/carousel.less less/close.less less/dropdowns.less less/labels-badges.less less/mixins.less less/navbar.less less/navs.less less/pagination.less less/responsive-navbar.less less/scaffolding.less less/sprites.less less/thumbnails.less less/type.less
2013-02-05derp, fix broke css and recompileMark Otto2-4/+6155
2013-02-05restore comma between selectorsMark Otto1-1/+1
2013-02-05Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into ↵Mark Otto2-2/+2
patrickhlauke-2.3.0-wip Conflicts: docs/assets/css/bootstrap.css less/navbar.less
2013-02-05Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into ↵Mark Otto19-6159/+126
patrickhlauke-2.3.0-wip Conflicts: docs/assets/css/bootstrap.css less/navbar.less
2013-02-05Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8fat-kun1-1/+1
Fix tooltip positioning for IE8 broken in 2.3.0
2013-02-05simplify media docsMark Otto2-12/+4
2013-02-05reorganize progress bars docsMark Otto2-116/+64
2013-02-05simpler alerts docsMark Otto2-34/+12
2013-02-05mo betta thumbnails docsMark Otto2-2/+4
2013-02-05reorder counters docsMark Otto2-14/+20
2013-02-05pagination docs cleanupMark Otto2-24/+6
2013-02-05simpler breadcrumbs docsMark Otto2-4/+2
2013-02-05Increase margins and line-height on h3; overhaul button dropdown docsMark Otto5-191/+65
2013-02-05Add justified button groups for link buttons; reorganize dropdowns and ↵Mark Otto4-58/+63
button groups docs sections
2013-02-05Forgot to remove base-css.mustacheMark Otto1-2101/+0
2013-02-04Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wipMark Otto1-1/+1
2013-02-04Remove base-css.html after recent mergesMark Otto1-2229/+0
2013-02-04Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto8-11/+360
Conflicts: docs/assets/css/bootstrap.css less/type.less
2013-02-04Fixes #6794: incorrect docs mention of th elementMark Otto2-4/+2
2013-02-04Fixes #6794: incorrect docs mention of th elementMark Otto2-4/+2
2013-02-04fix typoJoseph Price1-1/+1
2013-02-02Merge pull request #6638 from GeoffYoung/2.3.0-wipMark Otto1-1/+1
Update package.json to current Recess version
2013-02-02Revamp button mixins and pseudo statesMark Otto2-55/+25
* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway) * Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states
2013-02-02Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into ↵Mark Otto2-38/+105
vickash-3.0.0-wip
2013-02-02Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wipMark Otto2-6/+8
2013-02-02Add changelog file to repo instead of relying on the wikiMark Otto1-0/+324
2013-02-02Verion number in JS makefileMark Otto2-2/+2
2013-02-02Rearrange forms contentMark Otto2-236/+238
2013-02-02Simplify input and input group sizingMark Otto5-53/+84
* Remove .input-mini because who really needs inputs that small * Remove unnecessary border-radius resets from large and small input groups
2013-02-02Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into ↵Mark Otto3-14/+148
gilbarbara-3.0.0-wip
2013-02-02reordered access of options in tooltip and popover to allow overriding data ↵Joseph Price2-4/+4
attrs from js
2013-02-02Add @btn-color variable and use in buttons and carets; fixes dropup caret as ↵Mark Otto4-24/+14
well
2013-02-02Merge pull request #6763 from rjregenold/2.3.0-wipMark Otto2-6/+8
fixes jankiness with anchor tags in carousel.
2013-02-02Move to new selector interpolation, supported from 1.3.1Luke Page1-7/+6
2013-02-01Refactor navbar dividersMark Otto5-35/+57
* Instead of .divider-vertical, use .divider * Makes use of .nav-divider mixin * Dividers are horizontal to start, matching the default state of navbar nav links * Dividers become vertical above 768px via media queries
2013-02-01Fixes #6657: Upgrade Normalize to 2.1.0Mark Otto2-10/+43
2013-02-01Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wipMark Otto2-0/+3
2013-02-01Merge branch 'dospuntocero-master' into 2.3.0-wipMark Otto3-1/+26
2013-02-01add horizontal-three-color gradient testMark Otto2-1/+15
2013-02-01Refactor colors and progress barsMark Otto5-179/+173
* Buttons and progress bars now make use of more semantic global @brand- colors * Progress bars have been rewritten to reduce the number of possible selectors * Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01Merge pull request #6776 from ndabas/fix-inline-lists-ie7Mark Otto2-0/+3
Fix inline lists for IE7
2013-02-02Fixing inline lists for IE7Nikhil Dabas2-0/+3
2013-02-01Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto3-6/+6
Conflicts: docs/examples/hero.html docs/examples/sticky-footer-navbar.html
2013-02-01Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto3-6/+6
Conflicts: docs/examples/hero.html docs/examples/sticky-footer-navbar.html
2013-02-01Use button element instead of a for responsive navbar buttonsMark Otto5-10/+10
2013-02-01Use button element instead of a for responsive navbar buttonsMark Otto5-10/+10
2013-02-01start to refactor justified nav exampleMark Otto1-44/+55