aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-26maxcdn urlsv3.2.0Mark Otto1-3/+3
2014-06-26bump to v3.2.0Mark Otto30-75/+75
2014-06-26Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-36/+0
2014-06-26gruntMark Otto3-13/+32
2014-06-26Merge pull request #13574 from twbs/reinstate-13470Mark Otto1-36/+0
Delete redundant Grunt info in README (Merge before shipping)
2014-06-25gruntMark Otto3-11/+6
2014-06-25Merge pull request #13905 from Jimtrim/patch-1Mark Otto1-2/+2
Update cover.css
2014-06-25Mozilla bug says the fix targeted v31Chris Rebert1-1/+1
2014-06-25Merge branch 'master' of github.com:twbs/bootstrapMark Otto36-3203/+3140
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-06-25fixes #13912: make radios/checkboxes work with inline forms againMark Otto6-7/+7
2014-06-25Run `grunt`.XhmikosR7-14/+32
Revert a991cd572c8b3cafa6228915ca86f7a0cdd26e2d.
2014-06-25Revert "Revert "Turn off clean-css' advanced optimizations.""XhmikosR1-1/+2
This reverts commit e31c2edf885efd42d2e755f189cc15125d977d70.
2014-06-24grunt dist; closes #13914Chris Rebert7-7/+7
2014-06-24Revert "Turn off clean-css' advanced optimizations."Chris Rebert1-2/+1
This reverts commit 25ca51319b016bc4e42e1ba882d6f191e001d65d.
2014-06-24update shrinkwrap to get clean-css v2.2.3Chris Rebert1-29/+25
Refs #13914 Refs https://github.com/GoalSmashers/clean-css/issues/302
2014-06-24Merge pull request #13781 from twbs/saucierChris Rebert1-15/+14
Reenable additional Sauce browsers
2014-06-24reenable Win7 IE8-9 in SauceChris Rebert1-10/+10
2014-06-24reenable OS X Chrome in SauceChris Rebert1-5/+4
2014-06-24Merge pull request #13918 from twbs/sauce-with-retriesChris Rebert3-33/+98
Enable retrying of timed-out Sauce tests
2014-06-24Merge pull request #13916 from glebm/variable-orderMark Otto1-8/+3
Move variable declaration before its use (for Sass)
2014-06-24retry each test up to 3 times in the event of timeoutChris Rebert1-0/+1
Big thanks to @gvas for https://github.com/axemclion/grunt-saucelabs/pull/136 ! <3
2014-06-24upgrade grunt-saucelabs to ~8.1.0Chris Rebert2-33/+97
update shrinkwrap too
2014-06-24Move variable declaration before its use for SassGleb Mazovetskiy1-8/+3
In Sass, variable must be declared before it is used. This also removes Miscellaneous section, because horizontal line color and form / list paddings are Typography.
2014-06-24Merge pull request #13913 from hnrch02/webkit-keyframesChris Rebert1-0/+7
Partly revert cb7eb674accd24b6b73f26ef23cf4a301b6ebfaf
2014-06-24Run `grunt`.XhmikosR10-1549/+1476
2014-06-24Turn off clean-css' advanced optimizations.XhmikosR1-1/+2
Works around #13914. We might give it another go in the future but the stuff this breaks over the time does not justify having it enabled. The gain in size is negligible: dist/css/bootstrap.min.css: 108.65 kB → 109.5 kB dist/css/bootstrap-theme.min.css: 18.84 kB → 18.86 kB docs/assets/css/docs.min.css: 20.44 kB → 20.61 kB
2014-06-24Update dependencies.XhmikosR2-26/+26
2014-06-24Partly revert cb7eb674accd24b6b73f26ef23cf4a301b6ebfafHeinrich Fenkart1-0/+7
Fixes #13911
2014-06-23Merge branch 'fix-13386'fat1-0/+1
2014-06-23Merge branch 'master' into fix-13386fat75-3481/+7280
Conflicts: js/carousel.js
2014-06-23Merge pull request #13904 from twbs/revert-umdJacob17-1563/+1491
Revert UMD for now, due to #13812.
2014-06-23grid class inconsistency 2Julian Thilo1-2/+2
https://github.com/twbs/bootstrap/commit/32bde78e1996a92e6b801e1f4a475d5ab48685f8
2014-06-23Update cover.cssJim Frode Hoff1-2/+2
Moved the inset box-shadow to .site-wrapper in order to keep the shadow at the edges even if content exceeds viewport and needs scrolling.
2014-06-23Merge pull request #13882 from thomaswelton/issue-13713-use-variable-smallMark Otto1-2/+2
Use @font-size-small variable to calculate <small> font-size
2014-06-23Revert UMD (#13772 & friends) for now, due to #13812.Chris Rebert17-1563/+1491
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0. Revert "some changes from #13801 - add strict mode back and ==" This reverts commit 2b302f69eea416bc85e7827b7d7a74d49f879662. Revert "Fix regression of #10038 introduced by #13772" This reverts commit e9d6756a1ac76a9db31a41e8e03f663bedc41b70. Revert "MD/CommonJS/Globals #12909" This reverts commit 1c6fa9010daf0d0c21de9e20fe6ac4dba1788d90. Revert "address #13811" This reverts commit f347d7d955bbb17234b8e12c68efae7d516ce62c. Conflicts: js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tab.js js/tooltip.js
2014-06-23Merge pull request #13900 from twbs/customize_on_your_ownMark Otto1-1/+1
Remove broken link
2014-06-23grid class inconsistency /cc @juthiloMark Otto1-5/+5
2014-06-23Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-1/+1
2014-06-23Fixes #13903: Restore side padding on .btn-blockMark Otto6-8/+4
2014-06-23Use @font-size-small variable to calculate <small> font-size fixes #13713 #13809Thomas Welton1-2/+2
2014-06-23Merge pull request #13901 from knownasilya/typoChris Rebert1-1/+1
Fix typo in css - buttons docs
2014-06-23fix typo in css - buttonsIlya Radchenko1-1/+1
2014-06-23Remove broken link to Customizing BootstrapJulian Thilo1-1/+1
2014-06-22Merge branch 'master' of github.com:twbs/bootstrapMark Otto2-35/+43
2014-06-22new homepage expo featuresMark Otto2-17/+17
2014-06-23Update dependencies.XhmikosR2-35/+43
2014-06-20Fixes #13872 more: add overrides for lg and sm input modifiersMark Otto6-23/+34
2014-06-19tweak alert per #13875Mark Otto1-1/+1
2014-06-19Fixes #13872: Always apply padding to .form-control-static for that vertical ↵Mark Otto6-14/+11
alignment
2014-06-19formattingMark Otto1-5/+0