aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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
2013-02-01start to refactor justified nav exampleMark Otto1-44/+55
2013-02-01button element instead of href-less a tag for navbar buttonMark Otto1-2/+2
2013-02-01button element instead of href-less a tag for navbar buttonMark Otto1-2/+2
2013-02-01Update input-group-addon for input sizesGil Barbara2-5/+101
2013-01-31Refactor jumbotron-narrow.html exampleMark Otto1-7/+40
* Make it mobile-first * Add a handful of comments to explain CSS * Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31Refactor jumbotron-narrow.html exampleMark Otto1-7/+40
* Make it mobile-first * Add a handful of comments to explain CSS * Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31Rename marketing-narrow to jumbotron-narrow for mo betta naming schemesMark Otto1-0/+0
2013-01-31Rename marketing-narrow to jumbotron-narrow for mo betta naming schemesMark Otto4-4/+4
2013-01-31Refactor jumbotron example:Mark Otto1-22/+48
* Add hella CSS comments * Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px * Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31Refactor jumbotron example:Mark Otto1-22/+48
* Add hella CSS comments * Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px * Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31only round jumbotron corners at 768px+Mark Otto2-2/+2
2013-01-31Button up navbar form which was adding 2px padding to .navbarMark Otto2-3/+3
2013-01-31Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wipMark Otto1-11/+12
2013-01-31Update starter template to include left/right padding on inner container; ↵Mark Otto1-1/+4
also include body padding
2013-01-31Update starter template to include left/right padding on inner container; ↵Mark Otto1-1/+4
also include body padding
2013-01-31Remove gallery link from navbar; add to homepage examples section insteadMark Otto10-29/+2
2013-01-31Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto8-17/+26
Conflicts: docs/assets/css/bootstrap.css docs/assets/css/docs.css docs/assets/js/application.js docs/components.html docs/templates/pages/components.mustache less/sprites.less