aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-04-25Merge branch 'v4' of https://github.com/twbs/derpstrap into v4Mark Otto8-44/+77
2015-04-26automatic `grunt dist`Bootstrap's Grunt bot2-2/+2
[ci skip]
2015-04-25Remove inaccurate commentMark Otto1-1/+0
2015-04-26automatic `grunt dist`Bootstrap's Grunt bot6-6/+6
[ci skip]
2015-04-25Merge pull request #16280 from arxene/issue-16270Mark Otto1-1/+1
Fixes #16270.
2015-04-25Merge pull request #16369 from vsn4ik/split_docs_dropupMark Otto1-13/+19
DOCS: Separation of .dropdown and .dropup.
2015-04-26automatic `grunt dist`Bootstrap's Grunt bot6-8/+18
[ci skip]
2015-04-25Merge pull request #16333 from pine3ree/patch-2Mark Otto1-2/+4
form-group size + form-control-feedback
2015-04-25Merge pull request #16351 from thomasphorton/gutterRoundingMark Otto3-5/+5
Round results from gutter division to prevent decimal margins and padding
2015-04-25Merge pull request #16350 from thomasphorton/masterMark Otto1-0/+5
Add max-width: none to .media > .img-thumbnail
2015-04-25navMark Otto4-6/+6
2015-04-25automatic `grunt dist`Bootstrap's Grunt bot4-6/+18
[ci skip]
2015-04-25Merge pull request #16324 from twbs/address-16219Chris Rebert3-1/+28
Throw error when tooltip/popover template has multiple top-level elements
2015-04-25Throw error when tooltip/popover template has multiple top-level elementsChris Rebert3-1/+28
Closes #16219.
2015-04-25Merge pull request #16368 from vsn4ik/use_https_slackMark Otto1-2/+2
Use https on herokuapp.com
2015-04-25Use https on herokuapp.comvsn4ik1-2/+2
2015-04-25DOCS: Separation of .dropdown and .dropup.vsn4ik1-13/+19
2015-04-25Merge pull request #16367 from twbs/unresponsiveChris Rebert1-0/+58
Ensure .form-inline in non-responsive example doesn't stack
2015-04-25Link slack badgeMark Otto1-1/+1
2015-04-24Merge pull request #16344 from twbs/sed-taskChris Rebert3-5/+18
Fix #16075 by switching to maintained fork of grunt-sed
2015-04-24Fix collapsing .img-thumbnail due to display: table-cell clashing with max-widthThomas P. Horton1-0/+5
2015-04-24Ensure .form-inline in non-responsive example doesn't stack; fixes #15977Chris Rebert1-0/+58
2015-04-24Merge pull request #109 from twbs/callout-ifMark Otto1-6/+5
re-work callout tag conditional
2015-04-24re-work callout tag conditionalThomas McDonald1-6/+5
Output a warning if the type is not supported and default to info
2015-04-24Add slack badge, link to join, and update copyMark Otto1-1/+3
2015-04-24Merge pull request #16359 from twbs/bowerChris Rebert1-7/+1
Update bower.json to comply with new spec for `main`
2015-04-24bower.json: Remove bootstrap.css from `main`Chris Rebert1-1/+0
Per https://github.com/bower/bower.json-spec/pull/43 : > Use source files with module exports and imports over pre-built distribution files. Also, the example in that PR doesn't include /dist/movement.css or /dist/movement.min.css in its `main`. If you have a complaint about this, take it up with the Bower folks: https://github.com/bower/bower.json-spec/issues
2015-04-24bower.json: Remove font files from `main`Chris Rebert1-6/+1
Per https://github.com/bower/bower.json-spec/pull/43 : > font files [...] are not `main` files as they are not entry-points. If you have a complaint about this, take it up with the Bower folks: https://github.com/bower/bower.json-spec/issues
2015-04-23Round results from gutter division to prevent decimal margins and paddingThomas P. Horton3-5/+5
2015-04-23forms.md: fix typoChris Rebert1-1/+1
2015-04-23card.md: fix typoChris Rebert1-1/+1
2015-04-23Merge pull request #28 from twbs/tooltip-display-none-errorChris Rebert3-34/+68
throw error when trying to show tooltip on :hidden element
2015-04-23throw error when trying to show tooltip on :hidden elementChris Rebert3-34/+68
2015-04-23reboot.md: fix typoChris Rebert1-1/+1
2015-04-23_reboot.scss: fix typo in commentChris Rebert1-1/+1
2015-04-23update shrinkwrapChris Rebert1-4/+9
[skip sauce] [skip validator]
2015-04-23Fix #16075 by switching to maintained fork of grunt-sedChris Rebert2-1/+9
[skip sauce] [skip validator]
2015-04-23Merge pull request #16339 from twbs/releaseXhmikosR1-1/+1
Grunt: extend `prep-release` task.
2015-04-23Grunt: extend `prep-release` task.XhmikosR1-1/+1
Make it so that everything is done for us to reduce the possibility of missing something when releasing.
2015-04-23fix example thumbsMark Otto1-37/+37
2015-04-23add card grid sizingMark Otto1-0/+31
2015-04-23scope grid example styles betterMark Otto5-18/+42
2015-04-23update input groups to use new form control size classesMark Otto7-102/+22
2015-04-23drop .form-horizontalMark Otto1-69/+0
2015-04-23remove commented out codeMark Otto1-27/+0
2015-04-23Fix up some form docs styles, sizing, etcMark Otto10-166/+154
2015-04-23Update labels and form grid examplesMark Otto9-19/+57
2015-04-23more migration docs notesMark Otto1-12/+48
2015-04-23Run `grunt`.XhmikosR2-13/+12
[ci skip`
2015-04-23Update Blob.js to v2015-03-21.XhmikosR1-2/+16
[ci skip]