aboutsummaryrefslogtreecommitdiff
path: root/docs/assets
AgeCommit message (Collapse)AuthorFilesLines
2013-02-06Fixes #6823: add some docs notes about tooltips in input groupsMark Otto3-3/+3
2013-02-06Overhaul modal to make it responsive and not super lameMark Otto4-37/+67
2013-02-05Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto9-36/+152
Conflicts: docs/assets/css/bootstrap-responsive.css docs/assets/js/bootstrap-popover.js docs/assets/js/bootstrap.js docs/css.html docs/templates/pages/base-css.mustache js/bootstrap-popover.js less/mixins.less less/tooltip.less
2013-02-05Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wipfat5-11/+25
Conflicts: docs/assets/js/bootstrap.min.js
2013-02-05clean up stylesfat4-12/+109
2013-02-05Fixes #6190: Add print utility classesMark Otto5-9/+23
2013-02-05screwed up a merge and an old version number crept inMark Otto2-2/+2
2013-02-05don't hide if already hidden ya n00bfat3-3/+3
2013-02-05add codecademy to galleryMark Otto1-0/+0
2013-02-05Dat compressionMark Otto21-0/+0
2013-02-05Update homepage examples, add hella new sites to galleryMark Otto25-0/+8
2013-02-05White navbar brand text for inverted navbarMark Otto1-1/+1
2013-02-05clear interval in cycle + rebuildfat5-15/+18
2013-02-05Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wipfat2-47/+111
2013-02-05update jquery to 1.9fat1-2/+5
2013-02-05nuke rogue conflict comment and remakeMark Otto1-0/+4705
2013-02-05Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto1-4688/+0
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 Otto1-0/+6155
2013-02-05Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into ↵Mark Otto2-6097/+6
patrickhlauke-2.3.0-wip Conflicts: docs/assets/css/bootstrap.css less/navbar.less
2013-02-05Increase margins and line-height on h3; overhaul button dropdown docsMark Otto1-2/+6
2013-02-05Add justified button groups for link buttons; reorganize dropdowns and ↵Mark Otto1-0/+11
button groups docs sections
2013-02-04Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto1-1/+2
Conflicts: docs/assets/css/bootstrap.css less/type.less
2013-02-02Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into ↵Mark Otto1-0/+78
vickash-3.0.0-wip
2013-02-02Verion number in JS makefileMark Otto1-1/+1
2013-02-02Simplify input and input group sizingMark Otto1-34/+7
* 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 Otto1-5/+86
gilbarbara-3.0.0-wip
2013-02-02Add @btn-color variable and use in buttons and carets; fixes dropup caret as ↵Mark Otto1-13/+7
well
2013-02-02Merge pull request #6763 from rjregenold/2.3.0-wipMark Otto1-1/+2
fixes jankiness with anchor tags in carousel.
2013-02-01Refactor navbar dividersMark Otto1-11/+22
* 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 Otto1-2/+13
2013-02-01Refactor colors and progress barsMark Otto1-39/+21
* 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-02Fixing inline lists for IE7Nikhil Dabas1-0/+2
2013-02-01Update input-group-addon for input sizesGil Barbara1-5/+86
2013-01-31Rename marketing-narrow to jumbotron-narrow for mo betta naming schemesMark Otto1-0/+0
2013-01-31only round jumbotron corners at 768px+Mark Otto1-1/+1
2013-01-31Button up navbar form which was adding 2px padding to .navbarMark Otto1-2/+2
2013-01-31Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto2-7/+10
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
2013-01-31removes anchor tag definition.RJ Regenold1-1/+0
2013-01-31lets see how much i can mess this pull request up. :|RJ Regenold1-1/+1
2013-01-31fixes jankiness with anchor tags in carousel.RJ Regenold1-1/+3
2013-01-30make on prev commitMark Otto1-0/+1
2013-01-30clear up show-grid stuffMark Otto2-3/+3
2013-01-19Tighten up badges docs; less bottom margin on h3Mark Otto1-7/+16
2013-01-19Merge branch '3.0.0-wip-badges-to-counters' of ↵Mark Otto1-31/+9
https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters
2013-01-19IE8 compatible fix for disabled button hoverVickash Mahabir1-36/+96
2013-01-19Add sticky footer navbar example to list; fix docs paddingMark Otto1-1/+1
2013-01-18Change .badge to .counter, make appearance more OSX-ish, and remove colorsVickash Mahabir1-31/+9
2013-01-18Fix logic error where a disabled button would change color in an enabled ↵Vickash Mahabir1-24/+24
fieldset
2013-01-18Forgot to add built docs css fileVickash Mahabir1-18/+36
2013-01-17fix up jumbotron exampleMark Otto1-1/+1