aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-10-27scrollspy maybe?Mark Otto1-1/+1
2014-10-27gruntMark Otto2-2/+2
2014-10-27nav list updateMark Otto1-2/+11
2014-10-27fix home navMark Otto1-2/+6
2014-10-26gruntMark Otto4-4/+4
2014-10-26Merge branch 'master' into derpMark Otto7-245/+0
Conflicts: dist/css/bootstrap-theme.css.map dist/css/bootstrap.css.map docs/assets/js/raw-files.min.js docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css.map less/progress-bars.less less/theme.less
2014-10-26gruntMark Otto5-5/+5
2014-10-26Merge pull request #14881 from bhamodi/white-space-optimizationMark Otto8-29/+0
Removed unnecessary new lines that were inconsistent with the current formatting style.
2014-10-26fix progress bar animated biznasMark Otto13-162/+169
2014-10-26no more mixin, use regular propertyMark Otto1-2/+2
2014-10-26Removed unnecessary new lines that were inconsistent with current style.Baraa8-29/+0
2014-10-26rename that variableMark Otto1-1/+1
2014-10-26nuked that variableMark Otto1-1/+0
2014-10-26fix syntaxMark Otto1-1/+1
2014-10-26Merge branch 'master' into derpMark Otto82-1574/+2271
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 docs/_includes/components/dropdowns.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/less.html docs/_includes/css/overview.html docs/_includes/css/responsive-utilities.html docs/_includes/customizer-variables.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/grunt.html docs/_includes/getting-started/template.html docs/_includes/header.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/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/nav/components.html docs/_includes/nav/getting-started.html 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/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/components.html docs/components/navbar.md docs/css.html docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map 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/examples/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/grid/index.html docs/examples/jumbotron-narrow/index.html docs/examples/jumbotron/index.html docs/examples/justified-nav/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/offcanvas/index.html docs/examples/signin/index.html docs/examples/starter-template/index.html docs/examples/sticky-footer-navbar/index.html docs/examples/sticky-footer/index.html docs/examples/theme/index.html docs/examples/tooltip-viewport/index.html docs/getting-started.html docs/javascript.html docs/migration.html less/_animation.less less/_modal.less less/_navbar.less less/_variables.less less/glyphicons.less less/navs.less less/panels.less less/progress-bars.less
2014-10-26Merge branch 'master' into need-to-activate-animated-progressbarMark Otto5-4/+15
2014-10-26gruntMark Otto2-2/+2
2014-10-26Merge branch 'need-to-activate-animated-progressbar' of ↵Mark Otto2-2/+2
github.com:twbs/bootstrap into need-to-activate-animated-progressbar Conflicts: docs/_includes/components/progress-bars.html docs/assets/js/src/application.js
2014-10-26Merge pull request #14876 from twbs/fix-14875XhmikosR1-1/+1
bs-commonjs-generator.js: always use forward slashes in the require path.
2014-10-26Docs: progress bars' animation now needs to be manually toggledHeinrich Fenkart2-3/+8
Refs #14409
2014-10-26Merge pull request #14880 from danieljuhl/patch-2Julian Thilo1-0/+5
Added link to danish translation of docs
2014-10-26Added link to danish translation of docsDaniel Juhl1-0/+5
2014-10-26Replaces markdown.js with ↵jonschlinkert3-4/+6
[remarkable](https://github.com/jonschlinkert/remarkable). - remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html) - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark) - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
2014-10-26bs-commonjs-generator.js: always use forward slashes in the require path.XhmikosR1-1/+1
Since `path.resolve` is using backslashes on Windows, we ended up with different files. Just replace those with forward slashes.
2014-10-26Losslessly compress apple-touch-icon.png.XhmikosR1-0/+0
6314 -> 6140 bytes [ci skip]
2014-10-25fix clipboard button and examplesMark Otto3-4/+10
2014-10-26Docs: progress bars' animation now needs to be manually toggledHeinrich Fenkart2-3/+8
Refs #14409
2014-10-25Merge pull request #14748 from twbs/apple-touch-iconMark Otto3-1/+1
Docs: Use a 180x180 apple-touch-icon-precomposed.png.
2014-10-26Remove faulty unit test from 9740d8bHeinrich Fenkart1-30/+0
This would only work with transitions but since we disable them for unit tests, this delivers unreliably results.
2014-10-25new iconMark Otto1-0/+0
2014-10-26Follow-up to 9740d8b: fix small typoHeinrich Fenkart1-1/+1
2014-10-26gruntHeinrich Fenkart6-4/+10
2014-10-26Fix tooltip occasionally not hiding when using a hide delayPhil Hughes2-0/+33
Fixes #14375. Closes #14519 by merging it.
2014-10-25follow up fix for #14837 /cc @hnrch02Mark Otto9-9/+9
2014-10-26gruntHeinrich Fenkart7-22/+59
2014-10-26Allow multiple delegated tooltip selectors on a nodeAndrew S. Brown4-8/+95
Fixes #14167. Closes #14189 by merging it.
2014-10-25Merge pull request #13824 from jsdf/node-requirableMark Otto4-1/+45
Allow npm package to be resolved via node module resolution
2014-10-26gruntHeinrich Fenkart6-14/+24
2014-10-26Follow-up to e8af21c: rm unused variable in unit testHeinrich Fenkart1-1/+1
2014-10-26Clear scrollspy selection above first sectionTadeu Zagallo2-6/+52
Closes #13563 by merging it.
2014-10-25Fixes #14736: Reverts the remaining progress bar min value overrides from #12848Mark Otto8-33/+5
2014-10-25Fixes #14806: reset the text-shadow in the themed buttonsMark Otto9-6/+26
2014-10-25fix validationMark Otto1-3/+3
2014-10-25Fixes #14791: document dropdown dividersMark Otto2-4/+25
2014-10-25gruntMark Otto6-12/+34
2014-10-25Merge branch 'master' of github.com:twbs/bootstrapMark Otto3-13/+48
2014-10-25Fixes #14814: Use the link active bg variables for theme navbar gradientsMark Otto9-28/+28
2014-10-26Tabs plugin accessibilityCameron Little3-13/+48
Added support for `aria-expanded` toggling via JavaScript. Added `aria-controls`, `aria-expanded`, `aria-labelledby` to tabs docs. Added `aria-expanded` unit test for the tabs plugin. See also #13554. Closes #14154 by merging it.
2014-10-25Merge branch 'pr/14801'Mark Otto10-100/+162
Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
2014-10-25gruntMark Otto9-38/+43