aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-06Merge pull request #11758 from ZDroid/rm-brstck-bowerChris Rebert1-1/+0
Drop browserstack.json from bower.json ignore
2013-12-06Drop browserstack.json from bower.json ignoreZlatan Vasović1-1/+0
2013-12-06Darken icon bar to meet WCAGZlatan Vasović3-3/+3
2013-12-06Merge pull request #11755 from twbs/track-customize-jsMark Otto2-1/+11
track customize.js so that customizer works on GitHub Pages site
2013-12-06need customize.js to be tracked for it to work on GitHub PagesChris Rebert2-1/+11
follow-up to #11738
2013-12-06gruntChris Rebert1-1/+1
2013-12-06Merge pull request #11738 from XhmikosR/min-assetsMark Otto3-5/+12
Minify docs-assets too.
2013-12-06Merge pull request #11742 from vincentchan/masterChris Rebert1-0/+1
Added link to Bootstrap in French (in about.html)
2013-12-06Merge pull request #11740 from XhmikosR/trailing-spacesChris Rebert1-2/+2
Remove trailing spaces
2013-12-06reverted changes in commit 96109d3 which seemed to break conditional classes ↵Luke Noel-Storr4-63/+79
in striped tables (ignoring the comment above that the previous rules were needed for just this purpose) fixes issue twbs/bootstrap#11728
2013-12-06Updated .scale() mixin so that it accepts optional vertical scale factor ↵Bohdan Ganicky1-4/+4
parameter.
2013-12-06Use a space before functions' bracket consistently.XhmikosR3-9/+9
2013-12-06Use a space after function consistently.XhmikosR7-36/+36
2013-12-06Adding Bootstrap in FrenchVincent Chan1-0/+1
2013-12-06bower.json: remove trailing spaces.XhmikosR1-2/+2
2013-12-06Minify docs-assets too.XhmikosR3-5/+12
2013-12-05Merge pull request #11723 from stof/patch-1Chris Rebert1-0/+10
Added the removal of tab-content and tab-pane in the migration guide
2013-12-05Merge pull request #11733 from KostyaTretyak/editChris Rebert2-4/+4
Fixed some errors in the documentation
2013-12-06This is error?kostyatretyak1-2/+2
2013-12-05Don't exclude fonts from bower installsDerek Kent1-1/+0
Excluding fonts/ from bower installs causes glyphicons to be unavailable to projects using development Bootstrap LESS files.
2013-12-06Fixed another small errorkostyatretyak1-1/+1
2013-12-06Merge branch 'master' of https://github.com/twbs/bootstrap into editkostyatretyak26-432/+827
2013-12-05Added the removal of tab-content and tab-pane in the migration guideChristophe Coevoet1-0/+10
2013-12-05Merge pull request #11718 from KostyaTretyak/oncev3.0.3Mark Otto1-0/+1
Added link to Ukrainian translation website (in about.html)
2013-12-05Use document scroll height instead of offset height to support body with ↵Lukáš Doležal1-1/+1
absolute height
2013-12-05Added links to Ukrainian translation websitekostyatretyak1-0/+1
2013-12-04one last gruntMark Otto1-1/+1
2013-12-04Merge pull request #11714 from ZDroid/redundant-commentMark Otto1-1/+0
Remove redundant, duplicate comment
2013-12-05Remove redundant, duplicate commentZlatan Vasović1-1/+0
2013-12-04Merge branch 'master' of github.com:twbs/bootstrapMark Otto3-266/+599
2013-12-04Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior ↵Mark Otto3-6/+11
across viewports and improve customization. Also addresses #10371, #10395, and #10465.
2013-12-04Merge pull request #11671 from XhmikosR/updatesMark Otto3-266/+599
Update 3rd party asset libraries
2013-12-04Merge branch 'master' into gradient-prefix-cleanupMark Otto20-66/+210
Conflicts: dist/css/bootstrap.min.css docs-assets/js/raw-files.js
2013-12-04gruntMark Otto1-2/+2
2013-12-04Fixes #11712: Better support for .table-responsive within .panel'sMark Otto4-2/+11
2013-12-04Fixes #11436: mention in docs that .container isn't nestable; update docs to ↵Mark Otto1-1/+2
mention width, not max-width
2013-12-04Merge pull request #11710 from JoahG/bootstrap-thumbMark Otto1-0/+0
Updates Jumbotron thumbnail
2013-12-04Merge pull request #11709 from mdxs/patch-1Chris Rebert1-1/+1
Dropping unused variable in dropdown.js
2013-12-04Add a migration tip for .label-important to .label-dangerCyrus Stoller1-0/+4
2013-12-04Updates Bootstrap thumbnailJoah Gerstenberg1-0/+0
2013-12-04Dropping unused variable in dropdown.jsmdxs1-1/+1
Dropping an unused variable in the Dropdown function inside the `dropdown.js` code. There are no new/changed unit tests, as there are no feature/bug changes requiring new test cases. For the record: I agree to dual-license this contribution under the Apache 2 and MIT licenses.
2013-12-04Merge pull request #11705 from cyrusstoller/migration-guideChris Rebert1-0/+4
Add a migration tip for .label to .label-default
2013-12-04Add a migration tip for .label to .label-defaultCyrus Stoller1-0/+4
2013-12-03Merge branch 'master' into responsive-visibility-tableMark Otto12-59/+117
Conflicts: dist/css/bootstrap.min.css
2013-12-03Merge pull request #11697 from twbs/btn-xs-10979Mark Otto4-7/+10
fix .btn-group-xs portion of #10979
2013-12-03fix broken link in CONTRIBUTING.mdChris Rebert1-1/+1
2013-12-03Merge pull request #11701 from twbs/sauce-labsChris Rebert5-49/+104
switch to Sauce Labs for our cross-browser JS unit testing needs
2013-12-03switch to Sauce Labs for our cross-browser JS unit testing needsChris Rebert5-49/+104
Fixes #11087
2013-12-04Corrected a small error in the documentationkostyatretyak1-1/+1
2013-12-03fix invalid HTML in components.htmlChris Rebert1-1/+1
type="button" doesn't make sense for an <a>