aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-02-24Merge pull request #15378 from twbs/fix-ie-modal-scrollbar-for-realzHeinrich Fenkart1-1/+6
Modal: Work around IE scrollbars not taking up page width
2015-02-22Merge pull request #15867 from twbs/sauce-iosChris Rebert1-1/+1
Use OS X 10.10 for Sauce iPhone simulator
2015-02-22Use OS X 10.10 for Sauce iPhone simulatorChris Rebert1-1/+1
[skip validator]
2015-02-22Merge pull request #15866 from twbs/bump-sauceChris Rebert2-62/+104
Bump grunt-saucelabs to ~8.6.0
2015-02-22update shrinkwrapChris Rebert1-61/+103
[skip validator]
2015-02-22bump grunt-saucelabs to ~8.6.0Chris Rebert1-1/+1
2015-02-21Merge pull request #15862 from dante2008/contri-doc-typoChris Rebert1-1/+1
Fix a typo in the contributing doc.
2015-02-22Fix a typo in contributing doc.dante20081-1/+1
2015-02-21Merge pull request #15861 from patrickhlauke/id-fixupPatrick H. Lauke1-1/+1
Fix copy/pasta'd id on accessibility skiplink callout
2015-02-21Fix copy/pasta'd id on accessibility skiplink calloutPatrick H. Lauke1-1/+1
2015-02-21Merge pull request #15860 from patrickhlauke/url-fixupPatrick H. Lauke1-1/+1
Typo in URL
2015-02-21Typo in URLPatrick H. Lauke1-1/+1
2015-02-21automatic grunt distBootstrap's Grunt bot3-2/+3
2015-02-20Fix #15652: Set `position: relative` on .{radio,checkbox}-inlineKevin Kirsche1-0/+1
Closes #15656 by merging it.
2015-02-20Fix capitalization/singular of comments in helper class docsQuy Ton1-5/+5
Closes #15839 by merging a tweaked version of it.
2015-02-20Merge pull request #15857 from jonchretien/fix-typos-in-docsChris Rebert2-6/+6
fixed a few typos in the docs
2015-02-20fixed a few typos in the docsJon Chretien2-6/+6
2015-02-20Merge pull request #15851 from twbs/depsXhmikosR8-89/+220
Bump devDependencies
2015-02-20Run `grunt`.XhmikosR5-5/+11
2015-02-20Update dependencies.XhmikosR3-84/+209
2015-02-19Fix #15712: Add example of how to use grid system within a modalKevin Kirsche1-0/+96
Closes #15725 by merging a tweaked version of it.
2015-02-19Dropdown docs: Tweak .dropup copyChris Rebert1-1/+1
2015-02-19Affix docs: add MDN link for `position: sticky`Chris Rebert1-1/+1
2015-02-19Merge pull request #15773 from kkirsche/patch-16Chris Rebert1-2/+2
Fix #15766: Clarify Affix plugin docs
2015-02-19automatic grunt distBootstrap's Grunt bot3-2/+5
2015-02-19Merge pull request #15699 from kkirsche/patch-8Chris Rebert1-0/+3
Fix #15691: .form-control-static changes height when empty
2015-02-19[Fixes #15691] .form-control-static changes height when emptyKevin Kirsche1-0/+3
[Fixes #15691] .form-control-static changes height when empty by setting the minimum height to the size it is when text is in the `.form-control-static` JSFiddle: http://jsfiddle.net/4pdo4yzo/ Compute the minimum height @line-height-computed = ~20px @font-size-base = 14px This should come to approx. 34px Add min-height to from-group-* per @cvrebert I had this wrong. The minimum height would depend on the font-size of that specific group, thus we need to declare it once for font-size-small and once also for font-size-large
2015-02-19[Fixes #15766] Need Clearer Affix plugin documentationKevin Kirsche1-2/+2
[Fixes #15766] Need Clearer Affix plugin documentation Remove trailing whitespace Update the documentation
2015-02-19Added package.js for Meteor integrationLuca Mussi2-0/+23
Closes #15716 by merging it.
2015-02-19Merge pull request #15846 from twbs/doc-15832Chris Rebert1-0/+20
Add Wall of Browser Bugs entries for #15832
2015-02-19Add Wall of Browser Bugs entries for #15832Chris Rebert1-0/+20
[skip sauce]
2015-02-19Merge pull request #15662 from kkirsche/patch-5Chris Rebert1-7/+30
Fix issue #15597 — Mention dropup variation in dropdown docs
2015-02-19automatic grunt distBootstrap's Grunt bot6-4/+64
2015-02-17automatic grunt distBootstrap's Grunt bot3-3/+6
2015-02-17Merge pull request #15703 from kkirsche/patch-9Mark Otto2-3/+7
[Fix Issue #15683] `readonly` input should not have a not-allowed cursor
2015-02-17Merge pull request #15822 from vsn4ik/upd_npmjs_linkChris Rebert2-2/+2
Use https://www.npmjs.com (new site).
2015-02-17Use https://www.npmjs.com (new site).vsn4ik2-2/+2
2015-02-16.gitattributes: treat source maps as binary filesChris Rebert1-0/+2
2015-02-16Merge pull request #15778 from twbs/node-012Chris Rebert3-121/+146
Travis: test against node.js 0.12.
2015-02-16Travis: test against node.js 0.12.XhmikosR3-121/+146
2015-02-16Merge pull request #15765 from twbs/docs.min.jsChris Rebert4-4/+4
Cleanup usage of & add notes about docs.min.js in examples
2015-02-16Use just holder.js instead of docs.min.js in examples when possibleChris Rebert2-2/+4
And add explanatory comments to the Carousel & Dashboard examples regarding holder.js [skip sauce]
2015-02-16Remove docs.min.js from Blog & Cover examples since it's unnecessary.Chris Rebert2-2/+0
2015-02-16Fix carousel example images after c08bf4ba8b968ecda295391b41d5e965b642ba7c.XhmikosR2-17/+3
The revert was incomplete.
2015-02-16Travis CI: Bump Rouge gem to 1.8.0.XhmikosR1-1/+1
2015-02-16Merge pull request #15809 from twbs/packages.json-filesXhmikosR1-0/+10
Specify the files to include in the npm package.
2015-02-15Specify the files to include in the npm package.XhmikosR1-0/+10
2015-02-14package.json: change the engine version to >= 0.10.1.XhmikosR1-1/+1
2015-02-13Merge pull request #15805 from aroben/patch-1Mark Otto1-0/+4
Include dist/ files in language stats on GitHub
2015-02-13Include dist/ files in language stats on GitHubAdam Roben1-0/+4
GitHub considers Bootstrap files to be vendored files, and excludes them from repository language statistics. This makes sense for most repositories, where Bootstrap is indeed third-party code. This repository is the exception; it's first-party code here, so should count toward the language statistics.