aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-15add a couple commasChris Rebert1-1/+1
2014-01-15Merge pull request #12241 from twbs/jekyll-encodingChris Rebert2-2/+3
Set Jekyll encoding and tweak Windows notes
2014-01-15indentation and page header changesMark Otto3-1528/+1499
2014-01-15Set Jekyll encoding and tweak Windows notesJulian Thilo2-2/+3
2014-01-15Merge branch 'master' into docs_derpMark Otto17-37/+100
Conflicts: docs/components.html docs/css.html
2014-01-14Merge pull request #12232 from twbs/mixing-docsMark Otto2-2/+6
clarify docs regarding non-mixable components
2014-01-14Merge pull request #12231 from twbs/calloutsMark Otto3-8/+8
callout severity tweaks
2014-01-14Merge branch 'master' of github.com:twbs/bootstrapMark Otto8-26/+64
Conflicts: docs/assets/js/customize.min.js
2014-01-14Fixes #12210: badges in xs buttonsMark Otto7-5/+18
2014-01-14clarify docs regarding non-mixable componentsChris Rebert2-2/+6
2014-01-14downgrade .img-responsive cross-reference callout from warning to infoChris Rebert1-1/+1
2014-01-14upgrade form-group + input-group callout from info to warningChris Rebert1-1/+1
2014-01-14downgrade <label>-related callouts from danger to warningChris Rebert2-2/+2
2014-01-14upgrade tooltip/popover-in-groups callout from info to warningChris Rebert2-4/+4
2014-01-14revert unnecessary customizations of Blob.js & FileSaver.jsChris Rebert3-25/+9
Per https://github.com/eligrey/Blob.js/pull/20 & https://github.com/eligrey/FileSaver.js/pull/63 The library author has deemed the existing /*! @source URL */ comments to be sufficient attribution, and these already survive minification. Refs ea591748edee4f8fe722274b71787ccf2b052c4a
2014-01-14Merge pull request #12213 from twbs/browserstackChris Rebert4-0/+54
tests: run BrowserStack in parallel with Sauce Labs
2014-01-14Merge pull request #12229 from twbs/richer-resultsChris Rebert1-1/+6
more detailed QUnit test results in Sauce
2014-01-14more detailed QUnit test results in SauceChris Rebert1-1/+6
2014-01-14Add tooltip `viewport` option, respect bounds of the viewportBen Ogle4-30/+203
2014-01-14Merge branch 'master' into docs_derpMark Otto5-5/+16
Conflicts: docs/_includes/old-bs-docs.html
2014-01-14Don't copy-pasta all the Sass docs because fuck keeping that up to date. ↵Mark Otto3-154/+6
Instead, point to https://github.com/twbs/bootstrap-sass/blob/master/README.md.
2014-01-14add missing semicolonChris Rebert1-1/+1
2014-01-14tests: run BrowserStack in parallel with Sauce LabsChris Rebert4-0/+54
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999 and internal twbs team discussion. Effectively reverts the deletions from #11701.
2014-01-14Merge pull request #12224 from twbs/raw-files-bannerChris Rebert3-3/+14
add copyright notice to raw-files.js
2014-01-14add copyright notice to raw-files.jsChris Rebert3-3/+14
2014-01-14Merge pull request #12220 from ZDroid/linkJulian Thilo1-1/+1
Link the blog post instead of main blog page
2014-01-14Link the blog post instead of main blog pageZlatan Vasović1-1/+1
2014-01-14Merge pull request #12218 from ZDroid/docs.jsChris Rebert2-1/+1
Rename uglify.js to uglify.min.js for consistency
2014-01-14Rename docs/LICENSE-DOCS to docs/LICENSEZlatan Vasović1-0/+0
It sounded weird.
2014-01-14Rename uglify.js to uglify.min.js for consistencyZlatan Vasović2-1/+1
2014-01-13header masthead changesMark Otto2-3/+6
2014-01-13make page headers like mastheadMark Otto2-26/+18
2014-01-13Merge branch 'master' into docs_derpMark Otto15-75/+167
Conflicts: docs/assets/css/pack.min.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js
2014-01-13Merge pull request #12215 from twbs/attribution-commentsMark Otto8-18/+77
sort out attribution banners of docs assets
2014-01-13sort out attribution banners of docs assets; fixes #11976Chris Rebert8-18/+77
2014-01-13avoid redundant banner in minified docs CSSChris Rebert3-9/+1
2014-01-13add a title/description to customizer.js's attribution commentChris Rebert1-0/+1
2014-01-13Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into ↵Mark Otto10-8/+128
boulox-responsive-embed Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css
2014-01-13Merge pull request #12214 from twbs/slightly-newer-qunitChris Rebert2-45/+81
upgrade to QUnit v1.0.0
2014-01-13upgrade to QUnit v1.0.0Chris Rebert2-45/+81
2014-01-13Revert accidental overzealousness from 16eccc43d9Chris Rebert2-2/+2
Let's not confuse the archaeologists & historians.
2014-01-13update to Holder.js 5b79144faChris Rebert1-1/+1
2014-01-13preserve third-party attribution comments when minifying docs JSChris Rebert1-0/+2
2014-01-13document subheading syntaxChris Rebert1-0/+2
2014-01-12Merge branch 'master' into docs_derpMark Otto10-275/+428
Conflicts: docs/assets/js/docs.min.js
2014-01-12grunt dist build-customizerChris Rebert3-7/+8
2014-01-12update to FileSaver.js version 2013-12-27 / 0055d054acXhmikosR1-171/+8
Refs #12196
2014-01-12add Blob.js separate from filesaver.jsChris Rebert2-0/+167
Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c Refs #12196
2014-01-12update less.js to v1.6.1 & use accurate filename; refs #12196XhmikosR3-14/+17
2014-01-12update holder.js to v2.3; refs #12196XhmikosR1-82/+227