aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-01-05Merge pull request #15495 from twbs/sauce-maxPollRetriesChris Rebert1-0/+1
Sauce testing: set maxPollRetries to 4 for increased robustness
2015-01-05Sauce testing: set maxPollRetries to 4 for increased robustnessChris Rebert1-0/+1
2015-01-05grunt distChris Rebert8-12/+558
2015-01-05Merge pull request #40 from twbs/bye-affixChris Rebert5-157/+3
Remove affix from docs & CSS; add migration guidance
2015-01-05Remove affix from docs & CSS; add migration guidanceChris Rebert5-157/+3
2015-01-05Merge pull request #26 from twbs/autoprefixer-bump-mac-safariChris Rebert2-8/+1
bump min OS X Safari in Autoprefixer config to v7.1
2015-01-03overview.html: add missing <p>Chris Rebert1-1/+1
2015-01-03fix broke shit, recompileMark Otto14-53/+49
2015-01-03Merge branch 'master' into v4Mark Otto53-1604/+1508
Conflicts: Gruntfile.js dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.min.js docs/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.html docs/_includes/components/breadcrumbs.html docs/_includes/components/button-dropdowns.html docs/_includes/components/button-groups.html docs/_includes/components/dropdowns.html docs/_includes/components/glyphicons.html docs/_includes/components/input-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/labels.html docs/_includes/components/list-group.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/page-header.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/components/thumbnails.html docs/_includes/components/wells.html docs/_includes/css/buttons.html docs/_includes/css/code.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/css/tables.html docs/_includes/css/type.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/whats-included.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/nav/components.html docs/_includes/nav/javascript.html docs/_jade/customizer-variables.jade docs/_layouts/default.html docs/about.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/customize.html docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css less/glyphicons.less less/mixins/vendor-prefixes.less less/navbar.less less/popovers.less less/tables.less less/theme.less less/tooltip.less less/variables.less package.json scss/_carousel.scss scss/_close.scss scss/_forms.scss test-infra/npm-shrinkwrap.json
2015-01-03Merge branch 'v4' of https://github.com/twbs/derpstrap into v4Mark Otto1-1/+1
2015-01-02Add .disabled class styling for .btn-stylesliias1-0/+1
Bootstrap itself has .btn-default.disabled styled. IE8 with angularjs has some weird behaviour if anchor has disabled attribute set, so I use disabled class as a workaround and assume the .disabled class styles the buttons the same as disabled attribute would.
2015-01-01gruntMark Otto6-4/+12
2015-01-01override the box-shadows on active, checked, and indeterminate statesMark Otto1-0/+3
2015-01-01grunt distMark Otto13-127/+127
2015-01-01add indeterminate checkbox supportMark Otto3-9/+24
2015-01-01automatic grunt distBootstrap's Grunt bot1-12/+12
2015-01-01Merge pull request #15477 from ZDroid/2015Mark Otto15-15/+15
Happy New Year
2015-01-01fix typo in commentChris Rebert1-1/+1
2015-01-01automatic grunt distBootstrap's Grunt bot2-2/+2
2015-01-01Happy New Year :santa:Zlatan Vasović15-15/+15
2014-12-31Merge pull request #15472 from twbs/address-15288Chris Rebert1-0/+4
Document that responsive tables use `overflow-y: hidden`
2014-12-31Merge pull request #15473 from twbs/autoprefixer-docsChris Rebert1-0/+3
Document that Autoprefixer is required
2014-12-31Merge pull request #15464 from twbs/address-15419Chris Rebert5-11/+54
Address #15419
2015-01-01automatic grunt distBootstrap's Grunt bot6-6/+6
2014-12-31Merge pull request #55 from twbs/xl-sizeMark Otto1-20/+19
account for XL size tier in grid docs
2014-12-31change values, remove grid column size rowMark Otto1-17/+9
2014-12-31Merge branch 'v4' of https://github.com/twbs/derpstrap into v4Mark Otto49-469/+632
2014-12-31gruntMark Otto7-25/+29
2014-12-31larger hr border width so it shows upMark Otto1-1/+1
2014-12-31tweak and improve jumbotronsMark Otto2-18/+15
2014-12-31fix some source code for custom formsMark Otto1-3/+4
2014-12-31Merge pull request #15292 from twbs/customize-iconXhmikosR3-5/+9
Use a glyphicon instead of the unicode character.
2014-12-31Merge pull request #15474 from NateEag/patch-1Mark Otto1-1/+1
Remove extra word from disabling-responsiveness.html
2014-12-30Remove extra word from disabling-responsiveness.htmlNate Eagleson1-1/+1
2014-12-30Document that Autoprefixer is requiredChris Rebert1-0/+3
Closes #14937 [skip sauce]
2014-12-30Document that responsive tables use `overflow-y: hidden`Chris Rebert1-0/+4
Closes #15288 [skip sauce]
2014-12-30remove lingering reference to IE8 in the Carousel docsChris Rebert1-2/+2
2014-12-30remove lingering references to Less in the docsChris Rebert2-5/+5
2014-12-30Merge pull request #15470 from twbs/document-versionChris Rebert2-0/+7
Document the VERSION property of the jQuery plugins;
2014-12-30Document the VERSION property of the jQuery plugins; fixes #15202Chris Rebert2-0/+7
[skip sauce]
2014-12-30rm note about Safari<7.1 / iOS<8.0 percent rounding bugChris Rebert1-7/+0
2014-12-30bump min OS X Safari in Autoprefixer config to v7.1Chris Rebert1-1/+1
2014-12-30"plugins" => "third-party widgets"Chris Rebert1-1/+1
2014-12-30remove unnecessary reference to Bootstrap v3Chris Rebert1-2/+0
2014-12-30Fix @mdo's grammarChris Rebert5-5/+5
2014-12-30Switch to shields.io for badges in READMEHeinrich Fenkart1-4/+4
Closes #15380 [ci skip]
2014-12-30automatic grunt distBootstrap's Grunt bot4-24/+12
2014-12-30Merge pull request #15456 from twbs/bump-clean-cssChris Rebert3-61/+59
Bump grunt-contrib-cssmin to ~0.11.0
2014-12-30Use a glyphicon instead of the unicode character.XhmikosR3-5/+9
2014-12-29Merge pull request #15466 from twbs/revert-14189Chris Rebert4-81/+8
Revert #14189 to fix #15168