aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-01-28automatic grunt distBootstrap's Grunt bot2-2/+6
2015-01-28Merge pull request #15496 from twbs/15484-alternativeChris Rebert3-0/+17
Make $(document).tooltip({...}) without a `selector` throw an error
2015-01-28automatic grunt distBootstrap's Grunt bot2-2/+2
2015-01-28Merge pull request #15630 from twbs/tabs-cond-fixChris Rebert1-1/+1
Fix error in condition in Tab plugin
2015-01-28Update per @vsn4ik's requestsKevin Kirsche1-3/+2
data-example-id not need be moved. Only change, because data-example-id="static-dropdown" already exists. Remove whitespace after h3. Variation not need capitalize.
2015-01-28automatic grunt distBootstrap's Grunt bot1-3/+3
2015-01-27Merge pull request #15681 from twbs/fix-replaceArrowChris Rebert1-3/+3
Fix name of Tooltip.replaceArrow() parameter
2015-01-27Complete @vsn4ik's requestsKevin Kirsche1-2/+1
* Remove `<h3>Example</h3>;` * Move `data-example-id=""` to `<h3>Dropup Variation</h3>` and change value;
2015-01-27Fix name of Tooltip.replaceArrow() parameterChris Rebert1-3/+3
isHorizontal => isVertical
2015-01-27Merge pull request #15678 from coliff/patch-1Chris Rebert1-1/+1
Update non-responsive.css
2015-01-27Update non-responsive.cssChristian1-1/+1
Fix typo on Utilize
2015-01-26Gruntfile.js: Remove now unneeded validator relaxError option.XhmikosR1-2/+1
2015-01-26Fix validation errors.XhmikosR3-3/+3
Surprisingly those weren't reported by the validator; only in the grunt-contrib-htmlmin branch they were reported, so after digging into it, I saw they were indeed errors...
2015-01-23Fix issue #15597 — Mention dropup variation in dropdown docsKevin Kirsche1-6/+38
Fix issue #15597 — Mention dropup variation in dropdown docs Other pull request was so messed up I sincerely have no clue how to save it. The recommended command doesn't work, can't believe rebasing is so problematic...
2015-01-23Merge pull request #15660 from twbs/bump-dev-depsChris Rebert2-79/+35
update devDependencies
2015-01-23update shrinkwrapChris Rebert1-77/+33
2015-01-23update devDependenciesChris Rebert1-2/+2
upgrade grunt-contrib-jshint to ~0.11.0 upgrade load-grunt-tasks to ~3.0.0
2015-01-23Merge pull request #15651 from sebnow/bower-woff2Chris Rebert1-1/+2
Add woff2 font file to bower main files
2015-01-23Add woff2 font file to bower main filesSebastian Nowicki1-1/+2
If Bootstrap is installed through bower, the woff2 font file may not be copied over as it's not in the "main" files. The LESS files still reference the font file which results in errors.
2015-01-23Add a warning in images.html about text-align Nikita Rushmanov1-1/+5
People normally center images using text-align. However, the `.img-responsive` class changes the display type to block. As a result you can no longer align the image with text-align. You must instead do it with margin: auto. There was no note about this on the web page, and no mention about setting the display to block. Users were left on a frustrating journey to figure out why they can't center images anymore!
2015-01-23Fix image order in carousel exampleNikita Rushmanov1-4/+4
When the screen is shrunk below the md threshold, all the featurette columns stack. However, since the second featurette is "backwards", when stacked the second featurette looked awkward as the image came before the heading.
2015-01-23Center images in carousel exampleNikita Rushmanov1-3/+3
In order to see the changes, you must shrink the browser to below the md threshold.
2015-01-21Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-1/+0
2015-01-21keep the base64Mark Otto2-3/+3
2015-01-21Merge branch 'master' into move-inline-cssMark Otto21-18/+179
Conflicts: docs/assets/css/docs.min.css
2015-01-21Merge pull request #15299 from SpectrumPixel/patch-2Mark Otto1-1/+0
Remove "Separated link" in example where it's not
2015-01-21Merge branch 'master' of github.com:twbs/bootstrapMark Otto4-4/+6
2015-01-21Merge branch 'docs-anchors'Mark Otto11-12/+134
2015-01-21style changesMark Otto6-52/+38
2015-01-22automatic grunt distBootstrap's Grunt bot3-3/+4
2015-01-21Merge pull request #15628 from kkirsche/patch-1Mark Otto1-1/+2
[Fix Issue #15561] Fix badges not being resized inside .btn-group-xs if .btn-xs is not applied
2015-01-21Fix error in condition in Tab pluginChris Rebert1-1/+1
Refs #15186
2015-01-21Fix having multiple selectors on a single line.Kevin Kirsche1-1/+2
2015-01-21automatic grunt distBootstrap's Grunt bot2-2/+2
2015-01-21Merge pull request #15620 from twbs/iso-4217Chris Rebert3-0/+20
Add .glyphicon-* aliases for other ISO 4217-ish currency codes
2015-01-21Fix issue twbs/bootstrap#15561Kevin Kirsche1-1/+1
Fix issue twbs/bootstrap#15561 regarding badges not shrinking to fit inside of .btn-group-xs
2015-01-21Merge pull request #15621 from twbs/fix-12832Chris Rebert2-0/+4
Document sticky :hover on mobile browsers
2015-01-21Carousel example: move the Base64 images outside of the HTML.XhmikosR3-6/+20
Use a simple blank.gif and change the background color instead of duplicating stuff.
2015-01-21Move inline CSS to docs.css.XhmikosR15-46/+67
2015-01-21Add AnchorJS for docs anchors.XhmikosR9-9/+145
2015-01-20Merge pull request #15503 from twbs/qunitChris Rebert13-777/+1205
Update QUnit to v1.17.0.
2015-01-20tweak 'close reopened modal' unit test to work under new QUnit APIChris Rebert1-2/+7
2015-01-20fix bug in tab show/shown relatedTarget unit testChris Rebert1-1/+1
2015-01-20update JS unit tests to future-proof QUnit 1.16.0 APIChris Rebert11-226/+226
[skip validator]
2015-01-20Document sticky :hover on mobile browsers; fixes #12832Chris Rebert2-0/+4
2015-01-20Add .glyphicon-* aliases for other ISO 4217-ish currency codesChris Rebert3-0/+20
Fixes #15617.
2015-01-20Merge pull request #15619 from twbs/markdownChris Rebert3-27/+27
Change markdown library
2015-01-20update shrinkwrapChris Rebert1-24/+24
2015-01-20remarkable -> markdown-itChris Rebert2-3/+3
2015-01-20Merge pull request #15618 from twbs/update-sauceChris Rebert2-313/+143
update grunt-saucelabs to ~8.5.0