aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-02-07update example codeMark Otto2-26/+32
2013-02-07nuke that whitespaceMark Otto2-2/+0
2013-02-07finish modal tweaksMark Otto5-43/+38
2013-02-07update docs modalsMark Otto6-91/+132
2013-02-07add new modal to docs exampleMark Otto3-28/+56
2013-02-06Fixes #6823: add some docs notes about tooltips in input groupsMark Otto5-3/+9
2013-02-06Merge pull request #6813 from Yohn/patch-12Mark Otto2-3/+3
don't remove title attribute for tooltips for 2.3-wip
2013-02-06unit testsYohn1-2/+2
2013-02-06dont remove title attribute part 2Yohn1-1/+1
2013-02-06Overhaul modal to make it responsive and not super lameMark Otto8-76/+288
2013-02-05Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto9-9/+9
2013-02-05Update link to changelogMark Otto9-9/+9
2013-02-05Merge branch '2.3.0-wip' into 3.0.0-wipMark Otto19-65/+280
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-wipfat11-23/+47
Conflicts: docs/assets/js/bootstrap.min.js
2013-02-05clean up stylesfat9-102/+152
2013-02-05port docs fix from 2.3.0-wip to new css pageMark Otto2-0/+2
2013-02-05Fixes #6808: mention IE lame-itude in docs for invalid inputsMark Otto2-0/+2
2013-02-05Fixes #6190: Add print utility classesMark Otto6-9/+32
2013-02-05Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ↵fat5-8/+141
ghusse-2.3.0-wip
2013-02-05Merge pull request #6783 from joprice/popoverOptionsOverridefat-kun2-4/+4
reordered access of options in tooltip and popover
2013-02-05Merge pull request #6780 from agatronic/2.3.0-wipfat-kun1-7/+6
less: Move to new selector interpolation, supported from 1.3.1
2013-02-05screwed up a merge and an old version number crept inMark Otto3-3/+3
2013-02-05don't hide if already hidden ya n00bfat4-4/+4
2013-02-05add codecademy to galleryMark Otto3-0/+10
2013-02-05Dat compressionMark Otto21-0/+0
2013-02-05Update homepage examples, add hella new sites to galleryMark Otto29-20/+130
2013-02-05White navbar brand text for inverted navbarMark Otto2-2/+2
2013-02-05clear interval in cycle + rebuildfat6-15/+19
2013-02-05Merge pull request #6481 from pseidemann/patch-1fat-kun2-3/+3
don't remove title attribute for tooltips
2013-02-05Merge pull request #6488 from nanek/dropdowns-remove-touchstartfat-kun1-6/+6
Remove touchstart from bootstrap-dropdown.js.
2013-02-05Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wipfat20-112/+230
2013-02-05update jquery to 1.9fat2-4/+10
2013-02-05Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wipMark Otto1-1/+1
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