aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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-23add "focus" to focused btns with button pluginfat1-6/+22
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
2014-06-19fixes #13881: restore existing striped progress bar behavior with theme stylesMark Otto8-5/+23
2014-06-19bump npm-shrinkwrap to ~3.1.4Chris Rebert2-4/+4
2014-06-19gruntMark Otto1-2/+2
2014-06-19grunt distMark Otto9-13/+86
2014-06-19ids over namesMark Otto1-4/+4
2014-06-19Merge pull request #13867 from hnrch02/remove-depreacted-jscs-rulesChris Rebert9-462/+746
Remove deprecated JSCS rules
2014-06-19S H R I N K W R A PHeinrich Fenkart1-450/+734
2014-06-19Merge pull request #13866 from BBosman/ie8fontfaceMark Otto2-0/+4
Document #13863
2014-06-19Update a few source files to comply to new JSCS rulesHeinrich Fenkart6-7/+7
2014-06-19Remove deprecated JSCS rules and add requireSpaceAfterLineCommentHeinrich Fenkart1-4/+4
2014-06-19Bump grunt-jscs-checker to 0.5.1Heinrich Fenkart1-1/+1
2014-06-19Merge pull request #13877 from twbs/npm-shrinkwrapChris Rebert8-53/+3607
Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation
2014-06-19Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generationChris Rebert8-53/+3607
Instead of our homegrown grunt/shrinkwrap.js Fixes #13483. New npm-shrinkwrap.json is human-readable but still in a consistent/stable format. Should aid debugging, produce better diffs, and be less prone to merge conflicts
2014-06-19Document IE8 font-face weirdnessBas Bosman2-0/+4
2014-06-19Merge pull request #13870 from BBosman/gray-lightChris Rebert1-1/+1
Fix @gray-light in docs
2014-06-19Fix @gray-light in docsBas Bosman1-1/+1
2014-06-19Run `grunt`.XhmikosR11-11/+11
2014-06-19Merge pull request #13829 from BBosman/preserveXhmikosR1-9/+3
Always use preserveComment: 'some'
generated by cgit v1.2.3 (git 2.25.1) at 2026-07-04 00:54:32 +0000