aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-12-03fix broken textarea.form-control reported by @thomas-mcdonaldMark Otto1-6/+6
2014-12-03Nested button groups with only one child now have rounded corners (Iss.#15270)Matt Smith9-14/+15
2014-12-03automatic `grunt dist`Bootstrap's Grunt bot3-2/+3
2014-12-02Temporarily revert "automatic grunt dist" so Grunt bot will run again.Chris Rebert3-3/+2
This reverts commit 2c1c885ed4978900fb2a5e3310a428fd72b89c12.
2014-12-02Add support for example IDs to {% example %} template tagChris Rebert1-3/+3
e.g. {% example html id=some-example-id-here %}
2014-12-03automatic grunt distBootstrap's Grunt bot3-2/+3
2014-12-02bit of cleanupMark Otto2-36/+0
2014-12-02convert to scssMark Otto102-6742/+8354
2014-12-02Merge pull request #15269 from twbs/role-separatorChris Rebert1-1/+2
Whitelist <li role="separator">...</li> [skip sauce]
2014-12-02Whitelist <li role="separator">...</li>Chris Rebert1-1/+2
Refs https://www.w3.org/Bugs/Public/show_bug.cgi?id=27120 Refs #15263 [skip sauce]
2014-12-02Update Wall of Browser Bugs entry for #14972Chris Rebert1-2/+3
http://crbug.com/175502 is fixed in Chrome 40 and has been closed. But Windows is still broken due to http://crbug.com/438064 , which is open and currently targeting Chrome 41.
2014-12-02remove broken examples linkMark Otto1-1/+0
2014-12-01add examples description, remove browser bugs descriptionMark Otto1-4/+1
2014-12-01move examples index again, clean up navMark Otto2-4/+12
2014-12-01rearrange examplesMark Otto2-0/+20
2014-12-01update home and side nav to use new navbar structureMark Otto6-90/+65
2014-12-01add new album exampleMark Otto2-0/+215
2014-12-01Clean up navbar to remove .navbar-toggle, .navbar-collapse, and ↵Mark Otto9-348/+19
.navbar-header as they are no longer used; Add .navbar-toggler to .navbar-inverse
2014-12-01nav tweaksMark Otto1-1/+1
2014-12-01Merge branch 'master' into v4Mark Otto1-11/+0
Conflicts: docs/_includes/js/collapse.html
2014-12-01nuke the other incomplete example per @ianwMark Otto1-9/+0
2014-11-30fixes and gruntMark Otto11-96/+125
2014-11-30fix more broke shit, run gruntMark Otto7-89/+82
2014-11-30Merge branch 'master' into v4Mark Otto89-2782/+4298
Conflicts: Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/fonts/glyphicons-halflings-regular.eot dist/fonts/glyphicons-halflings-regular.svg dist/fonts/glyphicons-halflings-regular.ttf dist/fonts/glyphicons-halflings-regular.woff docs/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.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/labels.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/css/buttons.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/responsive-utilities.html docs/_includes/css/sass.html docs/_includes/css/tables.html docs/_includes/css/type.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/whats-included.html docs/_includes/js/affix.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/tabs.html docs/_includes/nav/components.html docs/_includes/nav/css.html docs/_includes/nav/javascript.html docs/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/fonts/glyphicons-halflings-regular.eot docs/dist/fonts/glyphicons-halflings-regular.svg docs/dist/fonts/glyphicons-halflings-regular.ttf docs/dist/fonts/glyphicons-halflings-regular.woff docs/examples/carousel/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/non-responsive/non-responsive.css docs/examples/sticky-footer-navbar/index.html docs/examples/theme/index.html fonts/glyphicons-halflings-regular.eot fonts/glyphicons-halflings-regular.svg fonts/glyphicons-halflings-regular.ttf fonts/glyphicons-halflings-regular.woff less/_carousel.less less/_forms.less less/glyphicons.less
2014-11-30Merge branch 'master' of github.com:twbs/bootstrapMark Otto18-2023/+2903
2014-11-30clarify collapse example with link and button triggers; also mention classesMark Otto1-8/+21
2014-11-30Merge pull request #15244 from zalog/patch-2Mark Otto1-0/+1
Center .icon-prev and .icon-next in carousel
2014-11-30Merge pull request #15258 from Quy/media-objectMark Otto1-16/+16
Add .media-object in docs
2014-11-30Add .media-object in docsQuy Ton1-16/+16
2014-11-30Example: minor image compression improvements.XhmikosR11-0/+0
[ci skip]
2014-11-30Merge pull request #15183 from twbs/depsXhmikosR4-2005/+2874
Update devDependencies
2014-11-30Update devDependencies.XhmikosR4-2005/+2874
2014-11-30Merge pull request #15134 from twbs/docs-ghXhmikosR1-2/+12
Add a target to generate the gh-pages files.
2014-11-30Merge branch 'master' of github.com:twbs/bootstrapMark Otto6-88/+85
2014-11-30Bump Glyphicons to v1.9Mark Otto23-655/+1315
2014-11-30Fixes #15096: Fix navbar forms in the non-responsive exampleMark Otto2-1/+83
2014-11-29Merge pull request #15133 from patrickhlauke/docs-table-fixesMark Otto6-88/+85
Fixes to scope
2014-11-29Fixes #15241: Add simple example to docs for collapse pluginMark Otto5-5/+35
2014-11-29gruntMark Otto8-12/+22
2014-11-29Fixes #15140: Restore more missing .media styles from shipping #14801Mark Otto1-4/+10
2014-11-29Alternate fix for #15250 with a more descriptive theme jumbotronMark Otto1-3/+2
2014-11-29gruntMark Otto6-13/+35
2014-11-29Fixes #15074: Fix the nesting problem with form control size variantsMark Otto4-14/+47
2014-11-29gruntMark Otto10-10/+16
2014-11-29Fixes #15124: Restore .media-objectMark Otto1-0/+4
2014-11-29Fixes #15148: make the dropdown and dropup menus have the same marginsMark Otto1-1/+1
2014-11-29fixes #15164: wrap disable pagination spans in another spanMark Otto1-6/+33
2014-11-29fix the run-onMark Otto1-1/+1
2014-11-29Merge pull request #15238 from peterblazejewicz/docs/dist-updateMark Otto1-1/+3
Add CSS source maps reference to docs. Closes #15211
2014-11-29clean up navbar examplesMark Otto8-236/+16