aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-18Run grunt dist after adding 'a' requirement to the text emphasis classesMark Otto7-11/+11
2014-01-18Merge branch 'master' into bg-variantMark Otto8-48/+117
Conflicts: less/mixins.less
2014-01-18Merge pull request #12286 from watilde/fixes-panelMark Otto4-27/+101
Fixes #12263: Remove border radius when it's not both ends in panel
2014-01-18Merge pull request #12249 from twbs/modal-mdMark Otto2-1/+2
add & use @modal-md Less var for uniformity
2014-01-18Merge pull request #12247 from twbs/text-emphasis-variantMark Otto2-20/+14
refactoring: add & use .text-emphasis-variant() mixin
2014-01-18Merge branch 'master' into modal-mdMark Otto55-1577/+2311
2014-01-18Merge branch 'master' into bg-variantMark Otto55-1577/+2311
2014-01-18Merge branch 'master' into text-emphasis-variantMark Otto55-1577/+2311
2014-01-18Merge branch 'master' of github.com:twbs/bootstrapMark Otto5-5/+5
2014-01-18move migration docs to new separate page, leave callout on getting started ↵Mark Otto5-418/+441
page; fixes #12244
2014-01-18Fix holder.js links in examplesJulian Thilo5-5/+5
Replaces links to holder.js with links to the new docs.min.js. The uncompressed holder.js file is now in docs/assets/js/vendor, which is excluded from Jekyll builds. In turn, Holder is now included in docs.min.js, which is smaller than holder.js, so this should make everybody happy. :)
2014-01-19remove border radius when it's not both ends in panelDaijiro Wachi4-27/+101
2014-01-18Merge pull request #12281 from XhmikosR/vendorMark Otto8-6/+8
Move docs third-party libraries to a separate folder.
2014-01-18kill bottom margin on last docs sectionMark Otto5-4/+7
2014-01-18Make spelling of Less uniform throughout the docsJulian Thilo3-9/+9
2014-01-18Fix typo in index.htmlJulian Thilo1-1/+1
2014-01-18Move docs third-party libraries to a separate folder.XhmikosR8-6/+8
2014-01-17copyMark Otto1-1/+1
2014-01-17present browser compatibility info in a tableChris Rebert1-8/+47
2014-01-17fix #12277Chris Rebert2-4/+4
Thanks to @Quy for pointing these out.
2014-01-17add namespace `.bs` also to the event `dismiss.modal`Tobias Lindig3-7/+7
2014-01-17Merge pull request #12276 from twbs/grunt-contrib-qunitChris Rebert1-1/+1
bump grunt-contrib-qunit to v0.4.0
2014-01-17bump grunt-contrib-qunit to v0.4.0Chris Rebert1-1/+1
2014-01-17fix #12274Chris Rebert1-13/+13
2014-01-17Merge pull request #12275 from ZDroid/ncssChris Rebert1-2/+2
Replace Normalize with Normalize.css
2014-01-17Replace Normalize with Normalize.cssZlatan Vasović1-2/+2
2014-01-17Merge pull request #12271 from tlindig/modal_remove_needless_spaceJulian Thilo3-3/+3
remove needless space character
2014-01-17remove needless space characterTobias Lindig3-3/+3
2014-01-16Revert "Add tooltip `viewport` option, respect bounds of the viewport"Chris Rebert4-203/+30
This reverts commit edb221a20ceabebd427e27d0432e94a227717217. Reverting due to broken JS unit tests. Conflicts: docs/javascript.html
2014-01-16Merge pull request #12267 from twbs/ie-10Chris Rebert1-6/+5
enable IE10 for Sauce tests
2014-01-16Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap ↵Mark Otto4-30/+203
into benogle-bo-tooltip-viewport Conflicts: docs/javascript.html
2014-01-16Merge branch 'master' of github.com:twbs/bootstrapMark Otto1-14/+11
2014-01-16Split box-sizing reset for faster renderingMark Otto6-6/+12
2014-01-16enable IE10 for Sauce testsChris Rebert1-6/+5
2014-01-16temporarily disable OS X Chrome Sauce test since it's being flakyChris Rebert1-4/+5
e.g.: Tested http://127.0.0.1:3000/js/tests/index.html Environment: OS X 10.9::chrome >> Timeout, waited for more than 300000 milliseconds
2014-01-16Merge pull request #12265 from twbs/ie-11Chris Rebert1-5/+5
enable IE11 in Sauce tests
2014-01-16Merge pull request #12264 from twbs/mavericks-safari-7Chris Rebert1-5/+1
upgrade to Safari 7 in Sauce tests
2014-01-16enable IE11 in Sauce testsChris Rebert1-5/+5
2014-01-16Merge pull request #12262 from twbs/osx-firefoxChris Rebert1-4/+4
re-enable OS X Firefox in Sauce tests
2014-01-16gruntMark Otto4-14/+14
2014-01-16upgrade to Safari 7 in Sauce testsChris Rebert1-5/+1
2014-01-16re-enable OS X Firefox in Sauce testsChris Rebert1-4/+4
2014-01-16add missing parenfat1-1/+1
2014-01-16tooltip subpixel test fixesfat1-2/+6
2014-01-16remove flaky pos bottom test which is effect by unit scroll posfat8-18/+9
2014-01-16new qunitfat9-1055/+1720
2014-01-16Merge pull request #12260 from patricker/patch-1Chris Rebert1-1/+1
Update javascript.html to fix Tabs example
2014-01-16Update javascript.htmlpatricker1-1/+1
Fixed issue in Tabs example where the div had been marked as 'active' but the li had not been. The correct tab of data would be displayed on load, but no tabs would be highlighted. The tabs with fade example does not have this issue. jsFiddle: http://jsfiddle.net/uXV56/
2014-01-16Merge pull request #12258 from ibash/masterChris Rebert1-1/+1
Fixing js error in IE9 where no transition is supported
2014-01-16Fixing js error in IE9 where no transition is supportedIslam Sharabash1-1/+1