aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-12-18run grunt distMark Otto4-47/+47
2013-12-18rewrite readme to restore lost information, only with a bit more formatting ↵Mark Otto1-14/+14
consistency
2013-12-18Merge pull request #11927 from twbs/revert_commitsMark Otto4-28/+28
Revert commits
2013-12-18Revert commitsJulian Thilo4-28/+28
Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team. This undoes the changes introduced by the following commits: https://github.com/twbs/bootstrap/commit/7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/ced08f69359f3a70771804a98fa3c499f388cc74
2013-12-18callout colorsMark Otto1-7/+11
2013-12-18more docsMark Otto5-48/+71
2013-12-18footer alignmentMark Otto1-17/+2
2013-12-18Merge branch 'master' into docs_derpMark Otto20-102/+122
2013-12-18Merge pull request #11881 from ZDroid/patch-1Mark Otto14-98/+99
Require comma on left side
2013-12-18Merge pull request #11804 from twbs/css-source-mapsMark Otto5-3/+22
enable CSS source maps in grunt-contrib-less
2013-12-18fix typoChris Rebert1-1/+1
2013-12-18Merge branch 'master' into docs_derpMark Otto12-120/+168
2013-12-18add source mapsMark Otto2-2/+2
2013-12-18Merge branch 'master' into css-source-mapsMark Otto52-978/+2146
Conflicts: Gruntfile.js
2013-12-18Fixes #11899: Ensure proper margins and .small/small usage for heading tags ↵Mark Otto3-11/+29
(e.g., .h1-.h6)
2013-12-18add inline note about navbar sizingMark Otto1-1/+1
2013-12-18Merge branch 'master' of github.com:twbs/bootstrapMark Otto9-109/+138
2013-12-18fixes #11925: cover template for firefoxMark Otto1-0/+1
2013-12-18tweaksMark Otto1-6/+7
2013-12-18Merge pull request #11923 from wangsai/fix-idChris Rebert1-1/+1
fix href of "Browser and device support"
2013-12-18fix href of "Browser and device support"wangsai1-1/+1
2013-12-17Merge pull request #11910 from InWayOpenSource/btn-group-inside-input-group-btnMark Otto3-11/+27
Fix handling of .btn-group placed inside .input-group-btn
2013-12-17Merge pull request #11916 from ZDroid/fix-iversionsChris Rebert1-2/+2
Downgrade Safari and OS X
2013-12-17Downgrade Safari and OS XZlatan Vasović1-2/+2
2013-12-17enable failHard grunt-html-validation option; fixes #11876Chris Rebert1-0/+1
2013-12-17upgrade to grunt-html-validation v0.1.11Chris Rebert1-1/+1
2013-12-16Fix handling of btn-group placed inside input-group-btn (used for mixing ↵Sebastian Podjasek3-11/+27
dropdowns with normal buttons)
2013-12-16Require comma on left sideZlatan Vasović14-98/+99
2013-12-16Merge pull request #11893 from twbs/separate-browsers-fileChris Rebert2-84/+92
move Sauce test browsers list out of Gruntfile into separate file
2013-12-16move Sauce test browsers list out of Gruntfile into separate fileChris Rebert2-84/+92
2013-12-16Merge branch 'master' into docs_derpMark Otto45-822/+1947
2013-12-16Merge pull request #11891 from twbs/cache-jekyll-bundleChris Rebert2-12/+16
use S3-cached Jekyll install to further speed up the Travis build
2013-12-15use S3-cached Jekyll installChris Rebert2-12/+16
2013-12-15Merge branch 'master' of github.com:twbs/bootstrapMark Otto12-89/+113
2013-12-15inform the people that fixed positioning ain't all it's cracked up to be /cc ↵Mark Otto1-0/+4
#11888
2013-12-15Merge pull request #11887 from twbs/minor-panels-refactorMark Otto1-9/+11
minor refactoring of 4ee93c9f8529cfeef56d4178b91e1ddcb0bff09c
2013-12-15Merge pull request #11890 from twbs/generic-cachingChris Rebert2-32/+52
make S3 caching significantly more generic
2013-12-15make S3 caching significantly more genericChris Rebert2-32/+52
2013-12-15minor refactoring of 4ee93c9f8529cfeef56d4178b91e1ddcb0bff09cChris Rebert1-9/+11
2013-12-15Merge pull request #11886 from twbs/html-validator-configChris Rebert1-0/+2
explicitly set more HTML5 validator options
2013-12-15explicitly set more HTML5 validator optionsChris Rebert1-0/+2
2013-12-15use unique IDs for input feedback examples so HTML validatesChris Rebert1-32/+32
2013-12-15use unique IDs for modal labels in doc examples so HTML validatesChris Rebert1-6/+6
2013-12-15simplify JS snippet slightlyChris Rebert1-1/+1
2013-12-15fix typo in docsChris Rebert1-1/+1
2013-12-15fix var name in example to follow JS conventionsChris Rebert1-2/+2
2013-12-15copyeditingChris Rebert7-7/+7
2013-12-15Fixes #10492 again, this time for last row's corners on striped tablesMark Otto3-1/+24
2013-12-15Add new form feedback states, clean up existing form stylesMark Otto7-37/+184
New stuff: * Adds `.has-feedback` and `.form-control-feedback` to show icon-based form feedback to users. Fixes #11836. * Removes the `width: 1em` on `.glyphicon` because it makes it impractical to resize the width of all icons, even if they’re not “empty” (e.g., a simple `.glyphicon { width: 30px; }` wouldn’t work, nor would a class preceeded by a parent class. Clean up: * Sets `width: auto;` on all `.form-control`s within inline forms. * Removes all the inline `select` menu `width` styles because all inputs are now `auto`. * Update form states docs to separate out sections better.
2013-12-15Fixes #11266: Apply a pixel-based line-height to date inputs for iOS 7Mark Otto3-1/+12