aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-01-19Merge pull request #15604 from twbs/ship_v3.3.2v3.3.2Mark Otto32-102/+102
Ship v3.3.2
2015-01-19gruntMark Otto3-3/+3
2015-01-19bump versionsMark Otto34-105/+105
2015-01-19gruntMark Otto1-1/+1
2015-01-18fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 ↵Mark Otto10-20/+20
to fix button sizing in Win 8.1 Chrome
2015-01-18Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-2/+2
2015-01-18Fixes #15142: Add position: relative; to .dropup for proper placement of menusMark Otto9-7/+10
2015-01-18rm dummy href from dismiss-on-next-click popover example; fixes #15277Chris Rebert1-2/+2
2015-01-18Merge branch 'master' into pr/15278Mark Otto141-1593/+1984
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2015-01-18gruntMark Otto6-11/+27
2015-01-17Merge pull request #15594 from twbs/fix_15493Mark Otto4-4/+12
Fixes #15493: inherit color on small/.small in .panel-title
2015-01-17fixes #15493: inherit color on small/.small in .panel-titleMark Otto4-4/+12
2015-01-18automatic grunt distBootstrap's Grunt bot3-3/+3
2015-01-17Merge pull request #15551 from lee101/masterMark Otto1-1/+1
Fix table-striped to work with bootstraps tooltips on rows
2015-01-16#15576 errata: #15298 also reproduces on LinuxChris Rebert1-1/+1
See https://github.com/twbs/bootstrap/issues/15298#issuecomment-69216754
2015-01-16automatic grunt distBootstrap's Grunt bot1-1/+1
2015-01-16Merge pull request #15589 from KevinJannis/patch-3Mark Otto1-0/+4
Added blank line between selectors in badges
2015-01-16Added blank line between selectors in badgesKevin Jannis1-0/+4
2015-01-16automatic grunt distBootstrap's Grunt bot1-1/+1
2015-01-16.form-control: add note about <select> & border-radiusChris Rebert1-1/+1
Refs #15340
2015-01-16automatic grunt distBootstrap's Grunt bot1-3/+3
2015-01-16Merge pull request #15583 from twbs/depsXhmikosR4-214/+139
Update devDependencies.
2015-01-16Merge pull request #15581 from twbs/inline-form-with-visible-labelsChris Rebert1-8/+36
Add example of using .form-inline with visible <label>s
2015-01-16Fix bogus JSCS warning.XhmikosR1-3/+3
2015-01-16Update JSCS config for the new version.XhmikosR1-0/+1
2015-01-16Update devDependencies.XhmikosR2-211/+135
2015-01-16Merge pull request #15585 from dancourse/patch-1Mark Otto1-1/+1
12 items of *fewer* as it's a countable item
2015-01-16automatic grunt distBootstrap's Grunt bot1-1/+1
2015-01-16Merge pull request #15584 from KevinJannis/patch-2Mark Otto1-0/+5
Added blank lines between selectors for alerts
2015-01-1612 items of *fewer* as it's a countable itemDan Course1-1/+1
http://www.oxforddictionaries.com/words/less-or-fewer
2015-01-16Added blank lines between selectors for alertsKevin Jannis1-0/+5
2015-01-15custom widths not always required for inline form fieldsChris Rebert1-1/+1
[skip sauce]
2015-01-15Add example of using .form-inline with visible <label>sChris Rebert1-8/+36
Refs #15410 [skip sauce]
2015-01-15Merge pull request #15580 from twbs/tooltip-async-docsChris Rebert2-6/+7
Document that tooltip+popover show+hide methods are async
2015-01-15Document that tooltip+popover show+hide methods are async; fixes #15500Chris Rebert2-6/+7
[skip sauce]
2015-01-15Fixes #15536, #15559: Add .form-group sizing support to .form-control-staticMark Otto4-2/+26
2015-01-15Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-0/+81
2015-01-15gruntMark Otto11-55/+44
2015-01-15Merge pull request #15498 from twbs/fix-15332Chris Rebert1-0/+81
Add examples of using feedback icons with .input-group
2015-01-15automatic grunt distBootstrap's Grunt bot4-3/+9
2015-01-15Merge pull request #15567 from twbs/fix-15565Mark Otto1-1/+1
Use @link-hover-decoration for .btn-link too; fixes #15565
2015-01-15Merge pull request #15482 from liias/patch-1Mark Otto1-0/+1
Add .disabled class styling for .btn-styles in theme
2015-01-15automatic grunt distBootstrap's Grunt bot1-1/+1
2015-01-15Merge pull request #15577 from KevinJannis/patch-1Mark Otto1-0/+1
Added blank line between selectors in jumbotron
2015-01-15Merge pull request #15578 from twbs/licensing-contributingChris Rebert1-3/+7
Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs
2015-01-15Merge pull request #15576 from twbs/chrome-bug-449180Chris Rebert1-0/+10
Add Wall of Browser Bugs entry for #15298
2015-01-15Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docsChris Rebert1-3/+7
[ci skip]
2015-01-15Added blank line between selectors in jumbotronKevin Jannis1-0/+1
2015-01-15Add Wall of Browser Bugs entry for #15298Chris Rebert1-0/+10
[skip sauce]
2015-01-15Docs: add missing "http://"Chris Rebert1-1/+1